init: init project step4: biz code support

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/UserDTO.java

@@ -60,4 +60,9 @@ public class UserDTO extends SysUser {
     private List<Long> areaCodes;
 
 
+    private Integer current;
+
+    private Integer size;
+
+
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmDaAgent.java

@@ -176,4 +176,10 @@ public class WmDaAgent implements Serializable {
 
     @TableField(exist = false)
     private List<Long> entIds;
+
+    @TableField(exist = false)
+    private Integer current;
+
+    @TableField(exist = false)
+    private Integer size;
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmDaDrugEnt.java

@@ -120,4 +120,10 @@ public class WmDaDrugEnt implements Serializable {
     @TableField(exist = false)
     private List<Long> entIds;
 
+    @TableField(exist = false)
+    private Integer current;
+
+    @TableField(exist = false)
+    private Integer size;
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -58,7 +58,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -845,16 +847,15 @@ public class SysUserController {
     /**
      * 分页查询用户
      *
-     * @param page    参数集
      * @param userDTO 查询参数列表
      * @return 用户集合
      */
-    @GetMapping("/selectUserList")
-    public R<?> selectUserList(Page<UserVO> page, UserDTO userDTO) {
+    @PostMapping(value = "/selectUserList")
+    public R<?> selectUserList(@RequestBody UserDTO userDTO) {
 
         HnqzUser user = SecurityUtils.getUser();
 
-        Page<UserVO> userVosPage = userService.selectUserList(page, userDTO, user);
+        Page<UserVO> userVosPage = userService.selectUserList(new Page<>(userDTO.getCurrent(), userDTO.getSize()), userDTO, user);
 
         Set<Integer> userIds = userVosPage.getRecords().stream().map(UserVO::getUserId).collect(Collectors.toSet());
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaAgentController.java

@@ -5,6 +5,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysAreaEntity;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptCsm;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
@@ -26,6 +28,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmRelationMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeEntRefMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeMapper;
+import com.qunzhixinxi.hnqz.admin.service.SysAreaEntityService;
 import com.qunzhixinxi.hnqz.admin.service.SysCsmUserRelationService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
@@ -92,17 +95,18 @@ public class WmDaAgentController {
     private final SysDeptCsmMapper sysDeptCsmMapper;
     private final SysUserAreaService userAreaService;
     private final SysEnterpriseAreaService enterpriseAreaService;
+    private final SysAreaEntityService areaEntityService;
 
     /**
      * 分页查询
      *
-     * @param page      分页对象
      * @param wmDaAgent 档案-代理商
      * @return 分页结果
      */
-    @GetMapping("/page")
-    public R<?> getWmDaAgentPage(Page page, WmDaAgent wmDaAgent) {
+    @PostMapping("/page")
+    public R<?> getWmDaAgentPage(@RequestBody WmDaAgent wmDaAgent) {
 
+        Page<WmDaAgent> page1 = new Page<>(wmDaAgent.getCurrent(), wmDaAgent.getSize());
         Integer myselfId = SecurityUtils.getUser().getDeptId();
 
         Set<Integer> ids = new HashSet<>();
@@ -125,12 +129,20 @@ public class WmDaAgentController {
 
         // 区域限制
         List<Long> areaId;
-        if (CollUtil.isNotEmpty(wmDaAgent.getAreaCodes())){
+        if (CollUtil.isNotEmpty(wmDaAgent.getAreaCodes())) {
 
             areaId = wmDaAgent.getAreaCodes();
 
         } else {
             areaId = userAreaService.listUserAreas(Long.valueOf(SecurityUtils.getUser().getId()));
+            if (CollUtil.isNotEmpty(areaId)) {
+                areaId = areaEntityService.list(Wrappers.<SysAreaEntity>lambdaQuery()
+                        .in(SysAreaEntity::getAreaId, areaId)
+                        .eq(SysAreaEntity::getAreaStatus, Boolean.TRUE)
+                        .eq(SysAreaEntity::getAreaType, UpmsType.AreaType.DISTRICT))
+                        .stream()
+                        .mapToLong(SysAreaEntity::getAreaId).boxed().distinct().collect(Collectors.toList());
+            }
 
         }
 
@@ -141,34 +153,31 @@ public class WmDaAgentController {
         resSet.retainAll(entIds.stream().map(Long::intValue).collect(Collectors.toSet()));
 
 
-        if (CollUtil.isEmpty(resSet)){
-            return R.ok(page);
+        if (CollUtil.isEmpty(resSet)) {
+            return R.ok(page1);
         }
 
         List<WmDaAgent> wmDaAgentList = wmDaAgentMapper.selectDeptByIds(resSet, wmDaAgent.getGsmc());
 
         if (CollUtil.isEmpty(wmDaAgentList)) {
-            return R.ok(page);
+            return R.ok(page1);
         }
 
 
         //每页数据条数
-        Page<WmDaAgent> page1 = new Page<>();
-        int current = Long.valueOf(page.getCurrent()).intValue();
-        int size = Long.valueOf(page.getSize()).intValue();
 
         int count = wmDaAgentList.size();
         List<WmDaAgent> pageList = new ArrayList<>();
         //计算当前页第一条数据的下标
-        int currId = current > 1 ? (current - 1) * size : 0;
-        for (int i = 0; i < size && i < count - currId; i++) {
+        int currId = wmDaAgent.getCurrent() > 1 ? (wmDaAgent.getCurrent() - 1) * wmDaAgent.getSize() : 0;
+        for (int i = 0; i < wmDaAgent.getSize() && i < count - currId; i++) {
             pageList.add(wmDaAgentList.get(currId + i));
         }
-        page1.setSize(size);
-        page1.setCurrent(current);
+        page1.setSize(wmDaAgent.getSize());
+        page1.setCurrent(wmDaAgent.getCurrent());
         page1.setTotal(count);
         //计算分页总页数
-        page1.setPages(count % size == 0 ? count / size : count / size + 1);
+        page1.setPages(count % wmDaAgent.getSize() == 0 ? count / wmDaAgent.getSize() : count / wmDaAgent.getSize() + 1);
 
         if (CollUtil.isNotEmpty(pageList)) {
             pageList.forEach(p -> {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaDrugEntController.java

@@ -84,13 +84,12 @@ public class WmDaDrugEntController {
     /**
      * 分页查询
      *
-     * @param page        分页对象
      * @param wmDaDrugEnt 档案-药企
      * @return 分页结果
      */
-    @GetMapping("/page")
+    @PostMapping("/page")
     @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_view')")
-    public R<?> getWmDaDrugEntPage(Page<WmDaDrugEnt> page, WmDaDrugEnt wmDaDrugEnt) {
+    public R<?> getWmDaDrugEntPage(@RequestBody WmDaDrugEnt wmDaDrugEnt) {
         if (SecurityUtils.getRoles().contains(19)) {
             // CSM只能查看自己维护的企业下的用户, 以及下属维护的企业下的用户
             Integer userId = SecurityUtils.getUser().getId();
@@ -98,6 +97,7 @@ public class WmDaDrugEntController {
             Set<Integer> allUserIds = sysCsmUserRelationService.recurseCsmLowerUserId(Collections.singleton(userId), new AtomicInteger(10));
             wmDaDrugEnt.setCsmUserIdList(allUserIds);
         }
+        Page<WmDaDrugEnt> page = new Page<>(wmDaDrugEnt.getCurrent(), wmDaDrugEnt.getSize());
         wmDaDrugEntService.selectPage(page, wmDaDrugEnt);
         return R.ok(page);
     }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2790,9 +2790,7 @@ public class WmScorePackageController {
             List<WmScoreTaskType> taskTypeList = wmScoreTaskTypeMapper.getScoreTaskTypeByScoreId(String.join(",", packageIds));
             Map<String, List<WmScoreTaskType>> taskTypeMap = taskTypeList.stream().collect(Collectors.groupingBy(WmScoreTaskType::getScoreId));
 
-            for (int i = 0; i < pageRecords.size(); i++) {
-                WmScorePackage wmScorePackage = pageRecords.get(i);
-
+            for (WmScorePackage wmScorePackage : pageRecords) {
                 List<WmTask> tasks = taskGoupMap.getOrDefault(wmScorePackage.getId(), new ArrayList<>());
                 List<WmScorePackageStatus> statuses = packageStatusGroupMap.getOrDefault(wmScorePackage.getId(), new ArrayList<>());
                 List<WmScoreTaskType> scoreTaskTypes = taskTypeMap.getOrDefault(wmScorePackage.getId(), new ArrayList<>());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskController.java

@@ -1173,10 +1173,10 @@ public class WmTaskController {
      *
      * @param page   分页对象
      * @param wmTask 任务表
-     * @return
+     * @return 任务列表
      */
     @GetMapping("/getWmTaskList")
-    public R getWmTaskList(Page page, WmTask wmTask) {
+    public R<?> getWmTaskList(Page page, WmTask wmTask) {
         if (page.getSize() > 500) {
             page.setSize(-1);
         }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmTaskService.java

@@ -27,198 +27,198 @@ import java.util.Map;
  * @date 2020-06-25 23:35:25
  */
 public interface WmTaskService extends IService<WmTask> {
-	public List<WmTask> listTask(QueryWrapper wrappers);
+    List<WmTask> listTask(QueryWrapper wrappers);
 
-	public Page<WmTask> listTaskPage(Page page, QueryWrapper wrappers);
+    Page<WmTask> listTaskPage(Page page, QueryWrapper wrappers);
 
-	public Page<WmTask> listTaskPage(Page page, LambdaQueryWrapper<WmTask> wrappers);
+    Page<WmTask> listTaskPage(Page page, LambdaQueryWrapper<WmTask> wrappers);
 
 
-	public IPage<WmTask> listTaskByExt(Page page, WmTask wmTask);
+    IPage<WmTask> listTaskByExt(Page page, WmTask wmTask);
 
-	public IPage<WmTask> listTaskByExt1(Page page, WmTask wmTask);
+    IPage<WmTask> listTaskByExt1(Page page, WmTask wmTask);
 
-	public List<WmTask> listTaskByExtNoPage(WmTask wmTask);
+    List<WmTask> listTaskByExtNoPage(WmTask wmTask);
 
-	/**
-	 * 患者教育-处方列表
-	 *
-	 * @param scorePackageId 积分包id
-	 * @param prescriptionNo 处方单编号
-	 * @return 处方列表分页
-	 */
-	IPage<WmTaskContent> listTaskPrescription(Page page, String scorePackageId, String prescriptionNo);
+    /**
+     * 患者教育-处方列表
+     *
+     * @param scorePackageId 积分包id
+     * @param prescriptionNo 处方单编号
+     * @return 处方列表分页
+     */
+    IPage<WmTaskContent> listTaskPrescription(Page page, String scorePackageId, String prescriptionNo);
 
-	/**
-	 * 患者教育-处方列表
-	 *
-	 * @param scorePackageId 积分包id
-	 * @param prescriptionNo 处方单编号
-	 * @return 处方列表
-	 */
-	List<WmTask> listTaskPrescription(String scorePackageId, String prescriptionNo);
+    /**
+     * 患者教育-处方列表
+     *
+     * @param scorePackageId 积分包id
+     * @param prescriptionNo 处方单编号
+     * @return 处方列表
+     */
+    List<WmTask> listTaskPrescription(String scorePackageId, String prescriptionNo);
 
-	public List<Map<String, Object>> getTaskListByPackageIds(WmTask wmTask);
+     List<Map<String, Object>> getTaskListByPackageIds(WmTask wmTask);
 
-	public List<Map<String, Object>> getTaskListByPackageIdsForJs(WmTask wmTask);
+     List<Map<String, Object>> getTaskListByPackageIdsForJs(WmTask wmTask);
 
-	public R selectZbCount(WmTask wmTask);
+     R selectZbCount(WmTask wmTask);
 
-	public List<Map<String, Object>> getTaskListByPackageIdsForJsUser(WmTask wmTask);
+     List<Map<String, Object>> getTaskListByPackageIdsForJsUser(WmTask wmTask);
 
-	public List<Map<String, Object>> getTaskListByPackageIdsCount(WmTask wmTask);
+     List<Map<String, Object>> getTaskListByPackageIdsCount(WmTask wmTask);
 
-	public List<Map<String, Object>> getTaskListByPackageIdsAndUser(WmTask wmTask);
+     List<Map<String, Object>> getTaskListByPackageIdsAndUser(WmTask wmTask);
 
-	public List<Map<String, Object>> getTaskListByPackageIdsZd(WmTask wmTask);
+     List<Map<String, Object>> getTaskListByPackageIdsZd(WmTask wmTask);
 
-	public List<WmTask> getTaskListByPackageIdsReturnWmtaskInfo(WmTask wmTask);
+     List<WmTask> getTaskListByPackageIdsReturnWmtaskInfo(WmTask wmTask);
 
-	public IPage<Map<String, Object>> getH5PackageList(Page page, WmTask wmTask);
+     IPage<Map<String, Object>> getH5PackageList(Page page, WmTask wmTask);
 
-	public IPage<Map<String, Object>> getH5TaskList(Page page, WmTask wmTask);
+     IPage<Map<String, Object>> getH5TaskList(Page page, WmTask wmTask);
 
-	R selectByWmTask(WmTask wmTask);
+    R selectByWmTask(WmTask wmTask);
 
-	R selectByWmTaskId(WmTask wmTask);
+    R selectByWmTaskId(WmTask wmTask);
 
-	R saveAndUpdateWmTask(WmTask wmTask, WmReport wmReport);
+    R saveAndUpdateWmTask(WmTask wmTask, WmReport wmReport);
 
-	R saveAndUpdateWmReport(WmTask wmTask, WmReport wmReport);
+    R saveAndUpdateWmReport(WmTask wmTask, WmReport wmReport);
 
-	public R selectList(Page page, WmScorePackage wmScorePackage);
+    public R selectList(Page page, WmScorePackage wmScorePackage);
 
-	public List<Map<String, Object>> getTaskListByIdsCount(WmTask wmTask);
+    public List<Map<String, Object>> getTaskListByIdsCount(WmTask wmTask);
 
-	List<Map<String, Object>> getTaskListByIds(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByIds(WmTask wmTask);
 
-	List<Map<String, Object>> getTaskListByIdsOld(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByIdsOld(WmTask wmTask);
 
-	List<Map<String, Object>> getTaskListByIdsJs(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByIdsJs(WmTask wmTask);
 
-	public List<WmTask> getTaskListByIdsReturnWmtaskInfo(WmTask wmTask);
+    public List<WmTask> getTaskListByIdsReturnWmtaskInfo(WmTask wmTask);
 
-	public List<Map<String, Object>> getTaskListByIdsZd(WmTask wmTask);
+    public List<Map<String, Object>> getTaskListByIdsZd(WmTask wmTask);
 
-	public List<Map<String, Object>> getTaskListByIdsZdJs(WmTask wmTask);
+     List<Map<String, Object>> getTaskListByIdsZdJs(WmTask wmTask);
 
 
-	R getWmTaskList(Page page, WmTask wmTask);
+    R getWmTaskList(Page page, WmTask wmTask);
 
-	R approvalTask(WmTask wmTask);
+    R approvalTask(WmTask wmTask);
 
-	Map<String, Timestamp> getMaxCreateTime(@Param("query") WmTask wmTask);
+    Map<String, Timestamp> getMaxCreateTime(@Param("query") WmTask wmTask);
 
-	R saveTaskSettle(WmTask wmTask);
+    R saveTaskSettle(WmTask wmTask);
 
-	/**
-	 * 患者教育-处方上传
-	 *
-	 * @param wmTask 任务对象
-	 * @return 是否成功状态
-	 */
-	R saveTaskPrescription(WmTask wmTask);
+    /**
+     * 患者教育-处方上传
+     *
+     * @param wmTask 任务对象
+     * @return 是否成功状态
+     */
+    R saveTaskPrescription(WmTask wmTask);
 
-	R updateTaskSettle(WmTask wmTask);
+    R updateTaskSettle(WmTask wmTask);
 
-	IPage<Map<String, Object>> selectSettleTask(Page page, WmTask wmTask);
+    IPage<Map<String, Object>> selectSettleTask(Page page, WmTask wmTask);
 
-	Boolean checkUserTaskSubScore(String userId, String limitValue);
+    Boolean checkUserTaskSubScore(String userId, String limitValue);
 
-	Boolean newCheckUserTaskSubScore(String userId, LocalDate createDate);
+    Boolean newCheckUserTaskSubScore(String userId, LocalDate createDate);
 
-	R getTaskInfo(String taskId);
+    R getTaskInfo(String taskId);
 
-	/**
-	 * 查询调查信息审核数据
-	 *
-	 * @param taskId 任务id
-	 * @return
-	 */
-	R<?> getSurveryTaskInfo(String taskId);
+    /**
+     * 查询调查信息审核数据
+     *
+     * @param taskId 任务id
+     * @return
+     */
+    R<?> getSurveryTaskInfo(String taskId);
 
-	/**
-	 * 患者教育-处方删除
-	 *
-	 * @param id 实际为WmTaskContent的id
-	 * @return 是否成功状态
-	 */
-	Boolean deleteTaskPrescription(Integer id);
+    /**
+     * 患者教育-处方删除
+     *
+     * @param id 实际为WmTaskContent的id
+     * @return 是否成功状态
+     */
+    Boolean deleteTaskPrescription(Integer id);
 
-	/**
-	 * 证据链批量上传
-	 *
-	 * @param commonEvidenceDTOMap 通用证据链DTO map
-	 * @param packageName          当前积分包名称
-	 * @return 错误证据链编号
-	 */
-	Map<String, String> taskBatchImport(Map<String, List<CommonEvidenceDTO>> commonEvidenceDTOMap,
-										String packageName);
+    /**
+     * 证据链批量上传
+     *
+     * @param commonEvidenceDTOMap 通用证据链DTO map
+     * @param packageName          当前积分包名称
+     * @return 错误证据链编号
+     */
+    Map<String, String> taskBatchImport(Map<String, List<CommonEvidenceDTO>> commonEvidenceDTOMap,
+                                        String packageName);
 
-	/**
-	 * 查询调查信息审核列表
-	 *
-	 * @param wmTask
-	 * @param startDate
-	 * @param endDate
-	 * @return
-	 */
-	IPage<WmTask> listInfoAudit(Page page, WmTask wmTask, LocalDateTime startDate, LocalDateTime endDate);
+    /**
+     * 查询调查信息审核列表
+     *
+     * @param wmTask
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    IPage<WmTask> listInfoAudit(Page page, WmTask wmTask, LocalDateTime startDate, LocalDateTime endDate);
 
-	/**
-	 * 查询同一家医院一个月做的任务
-	 *
-	 * @param hospitalId 医院id
-	 * @return
-	 */
-	List<WmTask> listCurrentMonthHospitalTask(String hospitalId);
-
-	/**
-	 * 查询会议任务个数
-	 *
-	 * @param taskTypeList 任务类型列表
-	 * @param taskUserId 用户id
-	 * @param startTime 会议时间范围-开始
-	 * @param endTime 会议时间范围-结束
-	 * @return 会议任务个数
-	 */
-	Long countMeetingTask(List<String> taskTypeList, String taskUserId, LocalDateTime startTime, LocalDateTime endTime);
-
-	/**
-	 * 个人包-任务复审
-	 *
-	 * @param id             任务id
-	 * @param taskStatus     审核状态(3-通过，4-不通过)
-	 * @param taskStatusInfo 审批说明
-	 * @return 复审结果
-	 */
-	Boolean reviewTask(String id, String taskStatus, String taskStatusInfo);
-
-	/**
-	 * 快速批量任务审核
-	 *
-	 * @param idList         任务id列表
-	 * @param taskStatus     审核状态(3-通过，4-不通过)
-	 * @param taskStatusInfo 审批说明
-	 * @return 审核结果
-	 */
-	Boolean batchApprovalTask(List<String> idList, String taskStatus, String taskStatusInfo);
-
-	/**
-	 * 更新调查信息数据
-	 *
-	 * @param task 任务信息
-	 * @param taskStatus 审核状态
-	 * @param taskStatusInfo 审批说明
-	 */
-	String task15_30_16_18(WmTask task, String taskStatus, String taskStatusInfo);
-
-	/**
-	 * 更新调查信息数据(只入库调查信息数据,不更新任务和积分包数据,用于手动处理)
-	 *
-	 * @param task 任务信息
-	 * @param taskStatus 审核状态
-	 * @param taskStatusInfo 审批说明
-	 */
-	void task15_30_16_18ForManualOperation(WmTask task, String taskStatus, String taskStatusInfo);
+    /**
+     * 查询同一家医院一个月做的任务
+     *
+     * @param hospitalId 医院id
+     * @return
+     */
+    List<WmTask> listCurrentMonthHospitalTask(String hospitalId);
+
+    /**
+     * 查询会议任务个数
+     *
+     * @param taskTypeList 任务类型列表
+     * @param taskUserId   用户id
+     * @param startTime    会议时间范围-开始
+     * @param endTime      会议时间范围-结束
+     * @return 会议任务个数
+     */
+    Long countMeetingTask(List<String> taskTypeList, String taskUserId, LocalDateTime startTime, LocalDateTime endTime);
+
+    /**
+     * 个人包-任务复审
+     *
+     * @param id             任务id
+     * @param taskStatus     审核状态(3-通过，4-不通过)
+     * @param taskStatusInfo 审批说明
+     * @return 复审结果
+     */
+    Boolean reviewTask(String id, String taskStatus, String taskStatusInfo);
+
+    /**
+     * 快速批量任务审核
+     *
+     * @param idList         任务id列表
+     * @param taskStatus     审核状态(3-通过，4-不通过)
+     * @param taskStatusInfo 审批说明
+     * @return 审核结果
+     */
+    Boolean batchApprovalTask(List<String> idList, String taskStatus, String taskStatusInfo);
+
+    /**
+     * 更新调查信息数据
+     *
+     * @param task           任务信息
+     * @param taskStatus     审核状态
+     * @param taskStatusInfo 审批说明
+     */
+    String task15_30_16_18(WmTask task, String taskStatus, String taskStatusInfo);
+
+    /**
+     * 更新调查信息数据(只入库调查信息数据,不更新任务和积分包数据,用于手动处理)
+     *
+     * @param task           任务信息
+     * @param taskStatus     审核状态
+     * @param taskStatusInfo 审批说明
+     */
+    void task15_30_16_18ForManualOperation(WmTask task, String taskStatus, String taskStatusInfo);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserAreaServiceImpl.java

@@ -67,7 +67,8 @@ public class SysUserAreaServiceImpl extends ServiceImpl<SysUserAreaMapper, SysUs
      */
     @Override
     public List<Long> listUserAreas(Long userId) {
-        return this.list(Wrappers.<SysUserArea>lambdaQuery().eq(SysUserArea::getUserId, userId)).stream().map(SysUserArea::getAreaId).collect(Collectors.toList());
+        return this.list(Wrappers.<SysUserArea>lambdaQuery().eq(SysUserArea::getUserId, userId)
+        ).stream().map(SysUserArea::getAreaId).collect(Collectors.toList());
     }
 
     /**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserServiceImpl.java

@@ -12,9 +12,11 @@ import com.alibaba.nacos.common.utils.Md5Utils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserDTO;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserInfo;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserPwd;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysAreaEntity;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
@@ -664,6 +666,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             areas = userDTO.getAreaCodes();
         } else {
             areas = userAreaService.listUserAreas(Long.valueOf(user.getId()));
+            if (CollUtil.isNotEmpty(areas)) {
+                areas = areaEntityService.list(Wrappers.<SysAreaEntity>lambdaQuery()
+                                .in(SysAreaEntity::getAreaId, areas)
+                                .eq(SysAreaEntity::getAreaStatus, Boolean.TRUE)
+                                .eq(SysAreaEntity::getAreaType, UpmsType.AreaType.DISTRICT))
+                        .stream()
+                        .mapToLong(SysAreaEntity::getAreaId).boxed().distinct().collect(Collectors.toList());
+            }
+
         }
 
         List<Integer> userid = userAreaService.listAreaUser(areas).stream().map(Long::intValue).collect(Collectors.toList());
@@ -694,20 +705,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             return baseMapper.getUserVosPage(page, userDTO, new DataScope());
         }
         Integer deptId = userDTO.getDeptId();
-//		if (null != userDTO.getDeptId()) {
-//			deptId = userDTO.getDeptId();
-//		}
         userDTO.setDeptId(SecurityUtils.getUser().getDeptId());
-//		if(SecurityUtils.getRoles().contains(7)) {
-//			List Listrole = new ArrayList();
-//			Listrole.add(7);
-//			userDTO.setRole(Listrole);
-//		}
         List<UserVO> userList = sysUserMapper.selectByDeptId(userDTO);
         SysDeptRelation sysDeptRelation = new SysDeptRelation();
         sysDeptRelation.setAncestor(userDTO.getDeptId());
         List<SysDeptRelation> sysDeptRelationList = sysDeptRelationMapper.selectListByAncestor(sysDeptRelation);
-        List<Integer> ids1 = sysDeptRelationList.stream().map(p -> p.getDescendant()).collect(Collectors.toList());
+        List<Integer> ids1 = sysDeptRelationList.stream().map(SysDeptRelation::getDescendant).collect(Collectors.toList());
         List<UserVO> userList1 = new ArrayList<>();
         List<UserVO> userList2 = new ArrayList<>();
         for (Integer id : ids1) {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaAgentServiceImpl.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysAreaEntity;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptCsm;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
@@ -29,6 +31,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmRelationMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeEntRefMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeMapper;
+import com.qunzhixinxi.hnqz.admin.service.SysAreaEntityService;
 import com.qunzhixinxi.hnqz.admin.service.SysCsmUserRelationService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
@@ -54,6 +57,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -88,6 +92,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
     private final RedisTemplate<String, Object> redisTemplate;
     private final SysEnterpriseAreaService enterpriseAreaService;
     private final SysUserAreaService sysUserAreaService;
+    private final SysAreaEntityService areaEntityService;
 
     public String getDeptBuildName(String deptId) {
         String buildName = "";
@@ -647,10 +652,10 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
         if (SecurityUtils.getRoles().contains(1) || SecurityUtils.getRoles().contains(2) || SecurityUtils.getRoles().contains(35)) {
             SysDept sysDept = new SysDept();
             List<SysDept> sysDeptList = sysDeptMapper.selectListByDept(sysDept);
-            for (int i = 0; i < sysDeptList.size(); i++) {
+            for (SysDept dept : sysDeptList) {
                 WmDept wmDept = new WmDept();
-                wmDept.setDeptId(Integer.parseInt(String.valueOf(sysDeptList.get(i).getDeptId())));
-                wmDept.setName(sysDeptList.get(i).getName());
+                wmDept.setDeptId(Integer.parseInt(String.valueOf(dept.getDeptId())));
+                wmDept.setName(dept.getName());
                 wmDeptList.add(wmDept);
             }
             return wmDeptList;
@@ -685,8 +690,28 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
             List<WmDaDrugEnt> wmDaDrugEntList = new ArrayList<>();
             List<SysDept> sysDeptList = new ArrayList<>();
             if (CollUtil.isNotEmpty(sysDeptRelationList)) {
+
+                // 区域限制
+                List<Long>  areaId = sysUserAreaService.listUserAreas(Long.valueOf(SecurityUtils.getUser().getId()));
+                if (CollUtil.isNotEmpty(areaId)) {
+                    areaId = areaEntityService.list(Wrappers.<SysAreaEntity>lambdaQuery()
+                                    .in(SysAreaEntity::getAreaId, areaId)
+                                    .eq(SysAreaEntity::getAreaStatus, Boolean.TRUE)
+                                    .eq(SysAreaEntity::getAreaType, UpmsType.AreaType.DISTRICT))
+                            .stream()
+                            .mapToLong(SysAreaEntity::getAreaId).boxed().distinct().collect(Collectors.toList());
+                } else {
+                    return Collections.emptyList();
+                }
+
+                List<Long> entIds = enterpriseAreaService.listAreaEnts(areaId);
+
+                // 交集
                 List<Integer> ids = sysDeptRelationList.stream().map(SysDeptRelation::getDescendant).collect(Collectors.toList());
-                for (Integer id : ids) {
+                Set<Integer> resSet = new HashSet<>(ids);
+                resSet.retainAll(entIds.stream().map(Long::intValue).collect(Collectors.toSet()));
+
+                for (Integer id : resSet) {
                     SysDept sysDept = sysDeptService.getById(id);
                     if (null != sysDept) {
                         sysDeptList.add(sysDept);
@@ -725,16 +750,16 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
                         wmDaAgentList.add(wmDaAgent2);
                     }
                 }
-                for (int i = 0; i < wmDaDrugEntList.size(); i++) {
+                for (WmDaDrugEnt wmDaDrugEnt : wmDaDrugEntList) {
                     WmDept wmDept = new WmDept();
-                    wmDept.setDeptId(wmDaDrugEntList.get(i).getDeptId());
-                    wmDept.setName(wmDaDrugEntList.get(i).getEntname());
+                    wmDept.setDeptId(wmDaDrugEnt.getDeptId());
+                    wmDept.setName(wmDaDrugEnt.getEntname());
                     wmDeptList.add(wmDept);
                 }
-                for (int i = 0; i < wmDaAgentList.size(); i++) {
+                for (WmDaAgent wmDaAgent : wmDaAgentList) {
                     WmDept wmDept = new WmDept();
-                    wmDept.setDeptId(wmDaAgentList.get(i).getDeptId());
-                    wmDept.setName(wmDaAgentList.get(i).getGsmc());
+                    wmDept.setDeptId(wmDaAgent.getDeptId());
+                    wmDept.setName(wmDaAgent.getGsmc());
                     wmDeptList.add(wmDept);
                 }
             }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

@@ -3,12 +3,16 @@ package com.qunzhixinxi.hnqz.admin.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysAreaEntity;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
 import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
+import com.qunzhixinxi.hnqz.admin.service.SysAreaEntityService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysEnterpriseAreaService;
@@ -27,6 +31,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 档案-药企
@@ -45,6 +50,7 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
     private final SysEnterpriseAreaService enterpriseAreaService;
     private final WmTaskSubmissionPercentRuleService taskSubmissionPercentRuleService;
     private final SysUserAreaService sysUserAreaService;
+    private final SysAreaEntityService areaEntityService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -176,6 +182,14 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
             areas = wmDaDrugEnt.getAreaCodes();
         } else {
             areas = sysUserAreaService.listUserAreas(Long.valueOf(SecurityUtils.getUser().getId()));
+            if (CollUtil.isNotEmpty(areas)){
+                areas = areaEntityService.list(Wrappers.<SysAreaEntity>lambdaQuery()
+                                .in(SysAreaEntity::getAreaId, areas)
+                                .eq(SysAreaEntity::getAreaStatus, Boolean.TRUE)
+                                .eq(SysAreaEntity::getAreaType, UpmsType.AreaType.DISTRICT))
+                        .stream()
+                        .mapToLong(SysAreaEntity::getAreaId).boxed().distinct().collect(Collectors.toList());
+            }
         }
 
         List<Long> ents = enterpriseAreaService.listAreaEnts(areas);
@@ -184,7 +198,7 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
         page.getRecords().forEach(ent -> {
             List<Long> areaCodes = enterpriseAreaService.listEntAreas(Collections.singletonList(Long.valueOf(ent.getDeptId())));
             ent.setAreaCodes(areaCodes);
-            ;
+
         });
 
     }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -2178,17 +2178,17 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     .count();
             // 平台未审核
             int temp = taskList.parallelStream()
-                    .filter(t -> StrUtil.equals(t.getTaskStatus(), "1"))
+                    .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "1"))
                     .mapToInt(WmTask::getScore)
                     .sum();
             // 待审核
             int dsh = taskList.parallelStream()
-                    .filter(t -> StrUtil.equals(t.getTaskStatus(), "2"))
+                    .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "2"))
                     .mapToInt(WmTask::getScore)
                     .sum();
             // 已审核
             int ysh = taskList.parallelStream()
-                    .filter(t -> StrUtil.equals(t.getTaskStatus(), "3"))
+                    .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "3"))
                     .mapToInt(WmTask::getScore)
                     .sum();
             // 已审核数
@@ -2678,21 +2678,22 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 .count();
         // 平台未审核
         int temp = taskList.parallelStream()
-                .filter(t -> StrUtil.equals(t.getTaskStatus(), "1"))
+                .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "1"))
                 .mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
                 .sum();
         // 待审核
         int dsh = taskList.parallelStream()
-                .filter(t -> StrUtil.equals(t.getTaskStatus(), "2"))
+                .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "2"))
                 .mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
                 .sum();
+        log.info("dsh_val:<--{}-->", dsh);
         // 已审核
         int ysh = taskList.parallelStream()
-                .filter(t -> StrUtil.equals(t.getTaskStatus(), "3"))
+                .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "3"))
                 .mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
                 .sum();
         // 已审核数
-        long yshnum = taskList.parallelStream().filter(t -> StrUtil.equals(t.getTaskStatus(), "3")).count();
+        long yshnum = taskList.parallelStream().filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "3")).count();
         // 已提交
         int ytj = temp + dsh + ysh;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -1447,8 +1447,8 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		IPage<WmTask> taskPage = wmTaskMapper.getWmTaskList(page, wmTask);
 		if (CollUtil.isNotEmpty(taskPage.getRecords())) {
 			Set<Integer> approvalUserIds = taskPage.getRecords().stream()
-					.filter(r -> r.getApprovalUserId() != null)
-					.map(WmTask::getApprovalUserId).collect(Collectors.toSet());
+					.map(WmTask::getApprovalUserId)
+					.filter(Objects::nonNull).collect(Collectors.toSet());
 			if (CollUtil.isNotEmpty(approvalUserIds)) {
 				List<SysUser> users = userService.listByIds(approvalUserIds);
 				Map<Integer, String> userMap = users.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getRealname));

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -939,6 +939,7 @@
 		p.score_package_name AS score_package_id,
 		t.task_type_id AS task_type_id,
 		t.lookinto_date AS lookinto_date,
+		t.real_flag AS realFlag,
 		t.province AS province,
 		t.city AS city,
 		t.area AS area,