Merge remote-tracking branch 'origin/master'

assistMg/src/main/java/com/hotent/baseInfo/controller/AuditedUnitController.java

@@ -4,12 +4,15 @@ import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
 import com.hotent.base.exception.BaseException;
 import com.hotent.base.model.CommonResult;
+import com.hotent.base.query.PageList;
 import com.hotent.baseInfo.model.AuditedUnit;
 import com.hotent.baseInfo.manager.AuditedUnitManager;
 import com.hotent.baseInfo.req.AuditedUnitPageReq;
 import com.hotent.baseInfo.resp.AuditedUnitDetailResp;
 import com.hotent.common.CrudService;
 import com.hotent.constant.BaseConstant;
+import com.hotent.project.model.CostAnnualPlan;
+import com.hotent.project.req.CostAnnualPlanPageReq;
 import com.hotent.resp.PageResp;
 import com.hotent.uc.util.ContextUtil;
 import io.swagger.annotations.Api;
@@ -59,8 +62,19 @@ public class AuditedUnitController {
         }
     }
 
+    @GetMapping("/getList")
+    @ApiOperation(value = "查询单位列表", notes = "按区域与名称过滤，上级可查看下级单位")
+    public CommonResult<List<AuditedUnit>> getList(
+            @ApiParam("需要过滤单位id") @RequestParam(value = "unitId", required = false) String unitId) {
+        try {
+            return CommonResult.<List<AuditedUnit>>ok().value(auditedUnitManager.getList(unitId));
+        } catch (Exception e) {
+            return CommonResult.<List<AuditedUnit>>error().message("查询失败：" + e.getMessage());
+        }
+    }
+
     //分页查询
-    @PostMapping("/pageList")
+    /*@PostMapping("/pageList")
     @ApiOperation(value = "分页查询pageList", notes = "分页查询pageList")
     public PageResp<AuditedUnit> page(@RequestBody AuditedUnitPageReq req) {
         try {
@@ -69,6 +83,12 @@ public class AuditedUnitController {
         } catch (Exception e) {
             throw new BaseException("查询错误");
         }
+    }*/
+
+    @PostMapping(value="/pageList")
+    @ApiOperation(value="分页查询pageList",httpMethod = "POST",notes = "分页查询pageList")
+    public PageList<AuditedUnit> pageList(@RequestBody AuditedUnitPageReq req) throws Exception {
+        return  auditedUnitManager.pageList(req);
     }
 
 

assistMg/src/main/java/com/hotent/baseInfo/controller/CostDocumentWhController.java

@@ -1,9 +1,12 @@
 package com.hotent.baseInfo.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import com.baomidou.mybatisplus.extension.api.R;
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
+import com.hotent.base.query.PageList;
 import com.hotent.baseInfo.model.CostCatalog;
 import com.hotent.baseInfo.req.CostCatalogPageReq;
 import com.hotent.baseInfo.req.CostDocumentWhPageReq;
@@ -13,6 +16,7 @@ import com.hotent.common.CrudService;
 import com.hotent.req.IdReq;
 import com.hotent.resp.PageResp;
 import io.swagger.annotations.Api;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -50,11 +54,12 @@ public class CostDocumentWhController{
 	/**
 	 * 查询文号分页列表
 	 */
-	@PostMapping("/pageList")
+	@SneakyThrows
+    @PostMapping("/pageList")
 	@ApiOperation(value = "分页查询pageList", notes = "分页查询pageList")
-	public PageResp<CostDocumentWh> getCatalogList(@RequestBody CostDocumentWhPageReq req) {
-
-		return crudService.pageQuery(req, costDocumentWhManager::getDocumentWhList);
+	public PageList<CostDocumentWh> getCatalogList(@RequestBody CostDocumentWhPageReq req) {
+		PageList<CostDocumentWh> documentWhList = costDocumentWhManager.getDocumentWhList(req);
+		return documentWhList;
 
 	}
 

assistMg/src/main/java/com/hotent/baseInfo/dao/AuditedUnitDao.java

@@ -1,6 +1,7 @@
 package com.hotent.baseInfo.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.baseInfo.model.AuditedUnit;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,6 +11,21 @@ public interface AuditedUnitDao extends BaseMapper<AuditedUnit> {
 
     List<AuditedUnit> selectByRegionAndName(@Param("regionCode") String regionCode,
                                             @Param("unitName") String unitName);
+
+    Page<AuditedUnit> getAuditedUnitPage(Page<AuditedUnit> objectPage,
+                                         @Param("dataScope") Integer dataScope,
+                                         @Param("provinceCode") String provinceCode,
+                                         @Param("cityCode") String cityCode,
+                                         @Param("countyCode") String countyCode,
+                                         @Param("areaCode") String areaCode,
+                                         @Param("unitName") String unitName);
+
+    List<AuditedUnit> getList(
+            @Param("unitId") String unitId,
+            @Param("dataScope") Integer dataScope,
+            @Param("provinceCode") String provinceCode,
+            @Param("cityCode") String cityCode,
+            @Param("countyCode") String countyCode);
 }
 
 

assistMg/src/main/java/com/hotent/baseInfo/dao/CostDocumentWhDao.java

@@ -1,7 +1,9 @@
 package com.hotent.baseInfo.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.baseInfo.model.CostDocumentWh;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 文书文号管理表 Mapper 接口
@@ -12,4 +14,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CostDocumentWhDao extends BaseMapper<CostDocumentWh> {
 
+    Page<CostDocumentWh> getPageList(Page<CostDocumentWh> page,
+                                     @Param("dataScope") Integer dataScope,
+                                     @Param("provinceCode") String provinceCode,
+                                     @Param("cityCode") String cityCode,
+                                     @Param("countyCode") String countyCode,
+                                     @Param("whType") String whType,
+                                     @Param("whName") String whName);
 }

assistMg/src/main/java/com/hotent/baseInfo/manager/AuditedUnitManager.java

@@ -2,6 +2,7 @@ package com.hotent.baseInfo.manager;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hotent.base.manager.BaseManager;
+import com.hotent.base.query.PageList;
 import com.hotent.baseInfo.model.AuditedUnit;
 import com.hotent.baseInfo.req.AuditedUnitPageReq;
 import com.hotent.baseInfo.resp.AuditedUnitDetailResp;
@@ -24,6 +25,9 @@ public interface AuditedUnitManager extends BaseManager<AuditedUnit> {
     //详情
     AuditedUnitDetailResp detail(String unitId);
 
+    PageList<AuditedUnit> pageList(AuditedUnitPageReq req) throws Exception;
+
+    List<AuditedUnit> getList(String unitId) throws Exception;
 }
 
 

assistMg/src/main/java/com/hotent/baseInfo/manager/CostDocumentWhManager.java

@@ -1,6 +1,8 @@
 package com.hotent.baseInfo.manager;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.hotent.base.query.PageList;
 import com.hotent.baseInfo.model.CostCatalog;
 import com.hotent.baseInfo.model.CostDocumentWh;
 import com.hotent.base.manager.BaseManager;
@@ -47,7 +49,7 @@ public interface CostDocumentWhManager extends BaseManager<CostDocumentWh> {
 	 * @param req 查询条件
 	 * @return 目录列表
 	 */
-	IPage<CostDocumentWh> getDocumentWhList(CostDocumentWhPageReq req);
+	PageList<CostDocumentWh> getDocumentWhList(CostDocumentWhPageReq req) throws Exception;
 
     void deleteByIds(List<String> ids);
 }

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/AuditedUnitManagerImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.manager.impl.BaseManagerImpl;
+import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
 import com.hotent.baseInfo.manager.CostCatalogManager;
 import com.hotent.baseInfo.model.AuditedUnit;
@@ -18,6 +19,8 @@ import com.hotent.constant.BaseConstant;
 import com.hotent.project.model.CostAnnualPlan;
 import com.hotent.project.resp.CostAnnualPlanDetailResp;
 import com.hotent.uc.api.model.IUser;
+import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import com.hotent.util.AreaCodeUtil;
 import com.hotent.util.CopyUtil;
@@ -27,12 +30,15 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
 public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, AuditedUnit> implements AuditedUnitManager {
 
+    @Autowired
+    private UserManager userService;
 
     @Override
     public List<AuditedUnit> listByRegionAndName( String unitId) {
@@ -89,7 +95,7 @@ public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, Audi
             qw.like(AuditedUnit::getUnitName, req.getUnitName());
         }
         // 创建分页对象
-        Page<AuditedUnit> page = new Page<>(req.getPageNum(), req.getPageSize());
+        Page<AuditedUnit> page = new Page<>(req.getPage(), req.getPageSize());
         return this.page(page,qw);
     }
 
@@ -120,6 +126,39 @@ public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, Audi
 
         return detailResp;
     }
+
+    @Override
+    public PageList<AuditedUnit> pageList(AuditedUnitPageReq req) throws Exception {
+        IUser iUser = ContextUtil.getCurrentUser();
+        User user = userService.getByAccount(iUser.getAccount());
+        req.setDataScope(user.getDataScope());
+        req.setProvinceCode(user.getProvinceCode());
+        req.setCityCode(user.getCityCode());
+        req.setCountyCode(user.getCountyCode());
+        Page<AuditedUnit> objectPage = new Page<>(req.getPage(),req.getPageSize());
+        //Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage(objectPage,params);
+        Page<AuditedUnit> page =baseMapper.getAuditedUnitPage(objectPage
+                ,req.getDataScope()
+                ,req.getProvinceCode(),req.getCityCode()
+                ,req.getCountyCode()
+                ,req.getAreaCode()
+                ,req.getUnitName());
+        return new PageList<>(page);
+    }
+
+    @Override
+    public List<AuditedUnit> getList(String unitId) throws Exception {
+        IUser iUser = ContextUtil.getCurrentUser();
+        User user = userService.getByAccount(iUser.getAccount());
+        //qw.eq("is_deleted", BaseConstant.NORMAL_STATUS);
+        List<AuditedUnit>  units=baseMapper.getList(unitId
+                ,user.getDataScope()
+                ,user.getProvinceCode()
+                ,user.getCityCode()
+                ,user.getCountyCode()
+                );
+        return units;
+    }
 }
 
 

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostDocumentWhManagerImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
 import com.hotent.baseInfo.model.CostCatalog;
 import com.hotent.baseInfo.model.CostDocumentWh;
@@ -16,9 +17,14 @@ import com.hotent.baseInfo.resp.AuditedUnitDetailResp;
 import com.hotent.baseInfo.resp.CostDocumentWhDetailResp;
 import com.hotent.constant.BaseConstant;
 import com.hotent.req.IdReq;
+import com.hotent.uc.api.model.IUser;
 import com.hotent.uc.exception.BaseException;
+import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
+import com.hotent.uc.util.ContextUtil;
 import com.hotent.util.AreaCodeUtil;
 import com.hotent.util.CopyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -43,7 +49,8 @@ import com.hotent.base.util.BeanUtils;
  */
 @Service
 public class CostDocumentWhManagerImpl extends BaseManagerImpl<CostDocumentWhDao, CostDocumentWh> implements CostDocumentWhManager {
-
+    @Autowired
+    private UserManager userService;
     @Override
     public CostDocumentWhDetailResp getDetail(String id) {
         CostDocumentWh costDocumentWh = this.get(id);
@@ -169,9 +176,9 @@ public class CostDocumentWhManagerImpl extends BaseManagerImpl<CostDocumentWhDao
     }
 
     @Override
-    public IPage<CostDocumentWh> getDocumentWhList(CostDocumentWhPageReq req) {
+    public PageList<CostDocumentWh> getDocumentWhList(CostDocumentWhPageReq req) throws Exception {
         // 构建查询条件
-        LambdaQueryWrapper<CostDocumentWh> queryWrapper = new LambdaQueryWrapper<>();
+        /*LambdaQueryWrapper<CostDocumentWh> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CostDocumentWh::getIsDeleted, BaseConstant.NORMAL_STATUS);
 
         // 根据查询条件过滤
@@ -180,11 +187,25 @@ public class CostDocumentWhManagerImpl extends BaseManagerImpl<CostDocumentWhDao
         }
         if (StringUtil.isNotEmpty(req.getWhName())) {
             queryWrapper.like(CostDocumentWh::getWhName, req.getWhName());
-        }
+        }*/
         // 创建分页对象
-        Page<CostDocumentWh> page = new Page<>(req.getPageNum(), req.getPageSize());
+        Page<CostDocumentWh> page = new Page<>(req.getPage(), req.getPageSize());
+
+        //Page<CostDocumentWh> respPage = this.page(page, queryWrapper);
+
+        IUser iUser = ContextUtil.getCurrentUser();
+        User user = userService.getByAccount(iUser.getAccount());
+        req.setDataScope(user.getDataScope());
+        req.setProvinceCode(user.getProvinceCode());
+        req.setCityCode(user.getCityCode());
+        req.setCountyCode(user.getCountyCode());
+
+        Page<CostDocumentWh> respPage= baseMapper.getPageList(page,req.getDataScope()
+                ,req.getProvinceCode(),req.getCityCode()
+                ,req.getCountyCode()
+                ,req.getWhType()
+                ,req.getWhName());
 
-        Page<CostDocumentWh> respPage = this.page(page, queryWrapper);
         List<CostDocumentWh> records = respPage.getRecords();
         for (CostDocumentWh costDocumentWh : records) {
 
@@ -193,8 +214,7 @@ public class CostDocumentWhManagerImpl extends BaseManagerImpl<CostDocumentWhDao
                     .replace("{year}", costDocumentWh.getYear()).replace("{currentValue}", costDocumentWh.getCurrentValue().toString());
             costDocumentWh.setWhNo(replace);
         }
-
-        return respPage;
+        return new PageList<>(respPage);
     }
 
 

assistMg/src/main/java/com/hotent/baseInfo/req/AuditedUnitPageReq.java

@@ -1,5 +1,6 @@
 package com.hotent.baseInfo.req;
 
+import com.hotent.base.query.PageBean;
 import com.hotent.req.PageReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,11 +10,20 @@ import lombok.Setter;
 @ApiModel("被监审单位分页查询参数")
 @Getter
 @Setter
-public class AuditedUnitPageReq extends PageReq {
+public class AuditedUnitPageReq extends PageBean {
 
     @ApiModelProperty(value = "所属区域")
     private String areaCode;
 
     @ApiModelProperty(value = "单位名称")
     private String unitName;
+
+    @ApiModelProperty(value = "级别0：省，1：市，2：区（县）")
+    private Integer dataScope;
+    @ApiModelProperty(value = "所属省")
+    private String provinceCode;
+    @ApiModelProperty(value = "所属市")
+    private String cityCode;
+    @ApiModelProperty(value = "所属区、县")
+    private String countyCode;
 }

assistMg/src/main/java/com/hotent/baseInfo/req/CostDocumentWhPageReq.java

@@ -1,5 +1,6 @@
 package com.hotent.baseInfo.req;
 
+import com.hotent.base.query.PageBean;
 import com.hotent.req.PageReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,10 +9,18 @@ import lombok.Data;
 
 @Data
 @ApiModel(value = "文号分页查询条件")
-public class CostDocumentWhPageReq extends PageReq {
+public class CostDocumentWhPageReq extends PageBean {
 
     @ApiModelProperty(value = "文号分类", example = "1")
     private String whType;
     @ApiModelProperty(value = "文号名称）", example = "1,2,3")
     private String whName;
+    @ApiModelProperty(value = "级别0：省，1：市，2：区（县）")
+    private Integer dataScope;
+    @ApiModelProperty(value = "所属省")
+    private String provinceCode;
+    @ApiModelProperty(value = "所属市")
+    private String cityCode;
+    @ApiModelProperty(value = "所属区、县")
+    private String countyCode;
 }

assistMg/src/main/resources/mapper/AuditedUnitMapper.xml

@@ -45,6 +45,63 @@
         ORDER BY unit_name ASC
     </select>
 
+
+
+    <select id="getAuditedUnitPage"
+            resultMap="BaseResultMap">
+        SELECT
+        c.*
+        FROM
+        cost_audited_unit c,
+        uc_user u
+        WHERE
+        c.create_by=u.ACCOUNT_
+
+        <if test=" areaCode != null and  areaCode != ''">
+            and c.area_code=#{areaCode}
+        </if>
+
+        <if test=" unitName != null and  unitName != ''">
+            and c.unit_name LIKE CONCAT('%', #{unitName}, '%')
+        </if>
+
+        <if test=" dataScope != null and  dataScope != ''">
+            <if test=" dataScope ==1">
+                and  (u.CITY_CODE=#{ cityCode} or c.area_code=#{ cityCode})
+            </if>
+            <if test=" dataScope ==2">
+                and (u.COUNTY_CODE=#{ countyCode} or c.area_code=#{ countyCode})
+            </if>
+        </if>
+        ORDER BY c.create_time DESC
+    </select>
+
+
+
+    <select id="getList"
+            resultMap="BaseResultMap">
+        SELECT
+        c.*
+        FROM
+        cost_audited_unit c,
+        uc_user u
+        WHERE
+        c.create_by=u.ACCOUNT_ and c.is_deleted=0
+        <if test=" unitId != null and  unitId != ''">
+            c.unit_id=#{unitId}
+        </if>
+        <if test=" dataScope != null and  dataScope != ''">
+            <if test=" dataScope ==1">
+                and  (u.CITY_CODE=#{ cityCode} or c.area_code=#{ cityCode})
+            </if>
+            <if test=" dataScope ==2">
+                and (u.COUNTY_CODE=#{ countyCode} or c.area_code=#{ countyCode})
+            </if>
+        </if>
+        ORDER BY c.create_time DESC
+    </select>
+
+
 </mapper>
 
 

assistMg/src/main/resources/mapper/CostAnnualPlanMapper.xml

@@ -75,13 +75,13 @@
 
         <if test=" dataScope != null and  dataScope != ''">
             <if test=" dataScope ==1">
-                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+                and  (u.CITY_CODE=#{ cityCode} or c.area_code=#{ cityCode})
             </if>
             <if test=" dataScope ==2">
-                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+                and (u.COUNTY_CODE=#{ countyCode} or c.area_code=#{ countyCode})
             </if>
         </if>
-        ORDER BY c.create_time
+        ORDER BY c.create_time DESC
     </select>
 
 

assistMg/src/main/resources/mapper/CostDocumentWhMapper.xml

@@ -55,4 +55,33 @@
 		where 
 		    id = ${id}
 	</select>
+
+
+
+    <select id="getPageList" resultMap="BaseResultMap">
+        SELECT
+        c.*
+        FROM
+        cost_document_wh c,
+        uc_user u
+        WHERE
+        c.create_by=u.ACCOUNT_
+        <if test=" whType != null and  whType != ''">
+            and c.wh_type=#{whType}
+        </if>
+
+        <if test=" whName != null and  whName != ''">
+            and c.wh_name LIKE CONCAT('%', #{whName}, '%')
+        </if>
+
+        <if test=" dataScope != null and  dataScope != ''">
+            <if test=" dataScope ==1">
+                and  (u.CITY_CODE=#{ cityCode} or c.area_code=#{ cityCode})
+            </if>
+            <if test=" dataScope ==2">
+                and (u.COUNTY_CODE=#{ countyCode} or c.area_code=#{ countyCode})
+            </if>
+        </if>
+        ORDER BY c.create_time DESC
+    </select>
 </mapper>

assistMg/src/main/resources/mapper/CostProjectApprovalMapper.xml

@@ -90,12 +90,12 @@
 
         <if test=" dataScope != null and  dataScope != ''">
             <if test=" dataScope ==1">
-                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+                and  (u.CITY_CODE=#{ cityCode} or c.area_code=#{ cityCode})
             </if>
             <if test=" dataScope ==2">
-                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+                and (u.COUNTY_CODE=#{ countyCode} or c.area_code=#{ countyCode})
             </if>
         </if>
-        ORDER BY c.create_time
+        ORDER BY c.create_time DESC
     </select>
 </mapper>

assistMg/src/main/resources/mapper/CostProjectMemoMapper.xml

@@ -116,12 +116,13 @@
 
 		<if test=" dataScope != null and  dataScope != ''">
 			<if test=" dataScope ==1">
-				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+				and  (uc.CITY_CODE=#{ cityCode} or cpm.area_code=#{ cityCode})
 			</if>
 			<if test=" dataScope ==2">
-				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+				and (uc.COUNTY_CODE=#{ countyCode} or cpm.area_code=#{ countyCode})
 			</if>
 		</if>
+		ORDER BY cpm.create_time DESC
 	</select>
 
 </mapper>

assistMg/src/main/resources/mapper/CostProjectTaskMapper.xml

@@ -45,13 +45,13 @@
 
         <if test=" dataScope != null and  dataScope != ''">
             <if test=" dataScope ==1">
-                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+                and  u.CITY_CODE=#{ cityCode}
             </if>
             <if test=" dataScope ==2">
-                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+                and  u.COUNTY_CODE=#{ countyCode}
             </if>
         </if>
-        ORDER BY c.create_time
+        ORDER BY c.create_time DESC
     </select>
 
 </mapper>

assistMg/src/main/resources/mapper/CostSurveyFdTemplateMapper.xml

@@ -121,13 +121,13 @@
 		</if>
 		<if test=" dataScope != null and  dataScope != ''">
 			<if test=" dataScope ==1">
-				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+				and (u.PROVINCE_CODE=#{ provinceCode} or u.CITY_CODE=#{ cityCode})
 			</if>
 			<if test=" dataScope ==2">
-				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+				and (u.PROVINCE_CODE=#{ provinceCode} or u.CITY_CODE=#{ cityCode} or u.COUNTY_CODE=#{ countyCode})
 			</if>
 		</if>
-		ORDER BY c.create_time
+		ORDER BY c.create_time DESC
 	</select>
 
 

assistMg/src/main/resources/mapper/CostSurveyTemplateMapper.xml

@@ -116,13 +116,13 @@
 		</if>
 		<if test=" dataScope != null and  dataScope != ''">
 			<if test=" dataScope ==1">
-				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+				and (u.PROVINCE_CODE=#{ provinceCode} or u.CITY_CODE=#{ cityCode})
 			</if>
 			<if test=" dataScope ==2">
-				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+				and (u.PROVINCE_CODE=#{ provinceCode} or u.CITY_CODE=#{ cityCode} or u.COUNTY_CODE=#{ countyCode})
 			</if>
 		</if>
-		ORDER BY c.create_time
+		ORDER BY c.create_time DESC
 	</select>
 
 

assistMg/src/main/resources/mapper/CostVerifyTemplateItemsMapper.xml

@@ -35,7 +35,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, survey_template_id, order_text,cell_code, calculation_formula, unit, order_num,headers_id, version_id, rkey, rvalue, json_str, cell_code, calculation_formula, unit, create_time, update_time, create_by, update_by, project_id,calculation_template_id,rowid,parentid
+        id, survey_template_id, order_text,cell_code, calculation_formula, unit, order_num,headers_id,
+version_id, rkey, rvalue, json_str, cell_code, calculation_formula, unit, create_time, update_time, create_by,
+          update_by, project_id,calculation_template_id,rowid,parentid
     </sql>
 
 	<select id="selectPage" resultMap="BaseResultMap">

assistMg/src/main/resources/mapper/CostVerifyTemplateMapper.xml

@@ -54,9 +54,6 @@
 			<if test="costSurveyTemplate.storageTable != null and costSurveyTemplate.storageTable != ''">
 				AND storage_table = #{costSurveyTemplate.storageTable}
 			</if>
-			<if test="costSurveyTemplate.status != null and costSurveyTemplate.status != ''">
-				AND status = #{costSurveyTemplate.status}
-			</if>
 			<if test="costSurveyTemplate.catalogId != null and costSurveyTemplate.catalogId != ''">
 				AND catalog_id = #{costSurveyTemplate.catalogId}
 			</if>
@@ -66,8 +63,9 @@
 			<if test="costSurveyTemplate.type != null and costSurveyTemplate.type != ''">
 				AND type = #{costSurveyTemplate.type}
 			</if>
-			AND is_delete = 0
+			AND is_delete = 0 and status in (0,1) ORDER BY create_time,status
 		</where>
+
 	</select>
 
 	<select id="selectPage" resultMap="BaseResultMap">
@@ -120,13 +118,13 @@
 		</if>
 		<if test=" dataScope != null and  dataScope != ''">
 			<if test=" dataScope ==1">
-				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+				and (u.PROVINCE_CODE=#{ provinceCode} or u.CITY_CODE=#{ cityCode})
 			</if>
 			<if test=" dataScope ==2">
-				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+				and (u.PROVINCE_CODE=#{ provinceCode} or u.CITY_CODE=#{ cityCode} or u.COUNTY_CODE=#{ countyCode})
 			</if>
 		</if>
-		ORDER BY c.create_time
+		ORDER BY c.create_time DESC
 	</select>
 
 

uc/src/main/java/com/hotent/uc/controller/UserController.java

@@ -152,6 +152,15 @@ public class UserController extends BaseController<UserManager, User> {
 	}
 
 
+	@RequestMapping(value="/users/getUserList",method=RequestMethod.GET, produces = {
+			"application/json; charset=utf-8" })
+	@ApiOperation(value = "根据级别获取用户", httpMethod = "GET", notes = "根据级别获取用户")
+	public CommonResult<List<User>> getUserList() throws Exception{
+		List<User> userList = userService.getUserList();
+		return CommonResult.<List<User>>ok().value(userList);
+	}
+
+
 	@RequestMapping(value="users/getAllUser",method=RequestMethod.GET, produces = {
 			"application/json; charset=utf-8" })
 	@ApiOperation(value = "获取系统中所有用户", httpMethod = "GET", notes = "获取系统中所有用户")

uc/src/main/java/com/hotent/uc/controller/UserController2.java

@@ -171,6 +171,12 @@ public class UserController2 extends BaseController2<UserManager, User> {
 		return CommonResult.<List<User>>ok().value(userList);
 	}
 
+
+
+
+
+
+
 	/**
 	 * 查询用户
 	 * @param filter

uc/src/main/java/com/hotent/uc/manager/UserManager.java

@@ -837,4 +837,6 @@ public interface UserManager extends BaseManager<User>{
 	CommonResult<?> addOrEditUser(UserVo user, String demId);
 
 	CommonResult<?> deleteUser(UserVo user,String demId);
+
+    List<User> getUserList();
 }

uc/src/main/java/com/hotent/uc/manager/impl/UserManagerImpl.java

@@ -3996,6 +3996,21 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 		return this.deleteUserByIds(user.getId());
 	}
 
+	@Override
+	public List<User> getUserList() {
+		QueryWrapper<User> wrapper = new QueryWrapper<>();
+		IUser iUser = ContextUtil.getCurrentUser();
+		User user = this.getByAccount(iUser.getAccount());
+		if (user.getDataScope().equals(1)) {
+			wrapper.eq("CITY_CODE",user.getCityCode());
+		}
+		if (user.getDataScope().equals(2)) {
+			wrapper.eq("COUNTY_CODE",user.getCountyCode());
+		}
+
+		return this.list(wrapper);
+	}
+
 	private boolean isUserNotInList(List<UserVo> list, UserVo user){
 		for (UserVo userVo : list) {
 			if(userVo.getId().equals(user.getId())){