Merge remote-tracking branch 'origin/dev' into dev

wangqian
2 parents a56c5a25 a12e2f40
Showing 9 changed files with 40 additions and 35 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java
urbanops-server/src/main/resources/application.yaml
@@ -20,7 +20,6 @@ import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
-import static com.zteits.urbanops.framework.common.pojo.CommonResult.error;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
 import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
@@ -44,7 +43,7 @@ public class EmergencyTaskController {
     @Operation(summary = "创建抢险任务主")
     @PreAuthorize("@ss.hasPermission('garden:emergency-task:create')")
     public CommonResult<Long> createEmergencyTask(@Valid @RequestBody EmergencyTaskSaveReqVO createReqVO) {
-        return success(emergencyTaskService.createEmergencyTask(createReqVO));
+        return success(emergencyTaskService.createEmergencyTask(createReqVO, true));
     }
     @PutMapping("/update")
@@ -91,7 +90,7 @@ public class EmergencyTaskController {
     @GetMapping("/page")
     @Operation(summary = "获得抢险任务主分页")
-   // @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')")
+    @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')")
     public CommonResult<PageResult<EmergencyTaskRespVO>> getEmergencyTaskPage(@Valid EmergencyTaskPageReqVO pageReqVO) {
         PageResult<EmergencyTaskRespVO> pageResult = emergencyTaskService.getEmergencyTaskPage(pageReqVO);
         return success(pageResult);
@@ -141,23 +140,23 @@ public class EmergencyTaskController {
             emergencyTaskExcleRespVO.setRemarks(emergencyTask.getRemarks());
             emergencyTaskExcleRespVO.setBusiStatus(getLabel(rescueStatusList, emergencyTask.getBusiStatus()));
             emergencyTaskExcleRespVO.setCompanyName(emergencyTask.getCompanyName());
-            emergencyTaskExcleRespVO.setDeptName(emergencyTask.getDeptName());
             emergencyTaskExcleRespVO.setApprovalUserName(emergencyTask.getApprovalUserName());
             emergencyTaskExcleRespVO.setApprovalRemarks(emergencyTask.getApprovalRemarks());
             emergencyTaskExcleRespVO.setCreatorName(emergencyTask.getCreatorName());
             emergencyTaskExcleRespVO.setCreateTime(emergencyTask.getCreateTime());
+            emergencyTaskExcleRespVO.setUpdaterName(emergencyTask.getUpdaterName());
             List<String> machineryList = new ArrayList<>();
             if(CollectionUtils.isEmpty(emergencyTask.getEmergencyMachineryList())){
-                emergencyTaskExcleRespVO.setMachineryInfo(Collections.EMPTY_LIST);
+                emergencyTaskExcleRespVO.setMachineryInfo(Collections.emptyList());
             }else{
                 emergencyTask.getEmergencyMachineryList().forEach(emergencyMachinery -> {
                     String machineryName = getLabel(mechanicalTypeNameList, emergencyMachinery.getMachineryNameId());
                     Integer machineryCount = emergencyMachinery.getMachineryCount();
                     machineryList.add(machineryName + ":" + machineryCount);
                 });
-                respList.add(emergencyTaskExcleRespVO);
                 emergencyTaskExcleRespVO.setMachineryInfo(machineryList);
             }
+            respList.add(emergencyTaskExcleRespVO);
         });
@@ -16,7 +16,7 @@ import java.util.List;
 public class EmergencyTaskExcleRespVO {
     @Schema(description = "任务编号（唯一标识，如生成规则：TASK+时间戳）", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("任务编号")
+    @ExcelProperty("案件编号")
     private String taskNo;
     @Schema(description = "发现险情时间", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -111,9 +111,4 @@ public class EmergencyTaskExcleRespVO {
     @ExcelProperty("归属公司")
     private String companyName;
-
-    @Schema(description = "部门(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12055")
-    @ExcelProperty("果蔬部门")
-    private String deptName;
-
 }
 \ No newline at end of file
@@ -46,4 +46,7 @@ public class EmergencyTaskPageReqVO extends PageParam {
     @Schema(description = "归属(一级部门id)", example = "6353")
     private Long companyId;
+
+    private List<Integer> busiStatusList;
+
 }
 \ No newline at end of file
@@ -132,7 +132,6 @@ public class EmergencyTaskRespVO {
     @ExcelProperty("归属(一级部门id)")
     private String companyName;
-
     @Schema(description = "部门(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12055")
     @ExcelProperty("部门")
     private String deptName;
@@ -36,7 +36,6 @@ public class EmergencyTaskSaveReqVO {
     private String emergencyLocation;
     @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "上报人不能为空")
     private String reporter;
     @Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -12,6 +12,7 @@ import com.zteits.urbanops.module.garden.dal.dataobject.emergencytask.EmergencyT
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo.*;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.util.CollectionUtils;
 /**
  * 抢险任务主 Mapper
@@ -31,16 +32,20 @@ public interface EmergencyTaskMapper extends BaseMapperX&lt;EmergencyTaskDO&gt; {
         if (reqVO.getEndTime() != null) {
             endDateTime = reqVO.getEndTime().atTime(LocalTime.MAX);
         }
-        return selectPage(reqVO, new LambdaQueryWrapperX<EmergencyTaskDO>()
-                .eqIfPresent(EmergencyTaskDO::getTaskNo, reqVO.getTaskNo())
+        LambdaQueryWrapperX<EmergencyTaskDO> sql = new LambdaQueryWrapperX<EmergencyTaskDO>()
+                .likeIfPresent(EmergencyTaskDO::getTaskNo, reqVO.getTaskNo())
                 .eqIfPresent(EmergencyTaskDO::getEmergencyTypeId, reqVO.getEmergencyTypeId())
                 .eqIfPresent(EmergencyTaskDO::getEmergencyHarmId, reqVO.getEmergencyHarmId())
                 .eqIfPresent(EmergencyTaskDO::getTreeOwnershipId, reqVO.getTreeOwnershipId())
                 .likeIfPresent(EmergencyTaskDO::getEmergencyLocation, reqVO.getEmergencyLocation())
                 .eqIfPresent(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatus())
                 .eqIfPresent(EmergencyTaskDO::getCompanyId, reqVO.getCompanyId())
-                .betweenIfPresent(EmergencyTaskDO::getDiscoveryTime, startDateTime, endDateTime)
-                .orderByDesc(EmergencyTaskDO::getId));
+                .betweenIfPresent(EmergencyTaskDO::getDiscoveryTime, startDateTime, endDateTime);
+        if(!CollectionUtils.isEmpty(reqVO.getBusiStatusList())){
+            sql.in(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatusList());
+        }
+        sql.orderByDesc(EmergencyTaskDO::getId);
+       return selectPage(reqVO, sql);
     }
     int deleteByTaskNo(@Param("taskNo") String taskNo);
@@ -22,7 +22,7 @@ public interface EmergencyTaskService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createEmergencyTask(@Valid EmergencyTaskSaveReqVO createReqVO);
+    Long createEmergencyTask(@Valid EmergencyTaskSaveReqVO createReqVO, boolean isSave);
     /**
      * 集团审批
@@ -58,7 +58,7 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Long createEmergencyTask(EmergencyTaskSaveReqVO createReqVO) {
+    public Long createEmergencyTask(EmergencyTaskSaveReqVO createReqVO, boolean isSave) {
         String userId = SecurityFrameworkUtils.getLoginUserId() + "";
         String userName = SecurityFrameworkUtils.getLoginUserNickname();
         String taskNo = createReqVO.getTaskNo();
@@ -89,12 +89,16 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
         emergencyTask.setStatus(createReqVO.getStatus());
         emergencyTask.setCompanyId(companyId);
         emergencyTask.setDeptId(deptId);
-        emergencyTask.setCreator(userId);
-        emergencyTask.setCreatorName(userName);
         emergencyTask.setUpdater(userId);
         emergencyTask.setUpdaterName(userName);
         emergencyTask.setApprovalRemarks("");
-        emergencyTaskMapper.insert(emergencyTask);
+        if(isSave){
+            emergencyTask.setCreator(userId);
+            emergencyTask.setCreatorName(userName);
+            emergencyTaskMapper.insert(emergencyTask);
+        }else{
+            emergencyTaskMapper.update(emergencyTask, new UpdateWrapper<EmergencyTaskDO>().eq("task_no", taskNo));
+        }
         List<EmergencyMachineryDO> list = new ArrayList<>();
         String finalTaskNo = taskNo;
@@ -124,7 +128,8 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
         String userId = SecurityFrameworkUtils.getLoginUserId() + "";
         String userName = SecurityFrameworkUtils.getLoginUserNickname();
         UpdateWrapper<EmergencyTaskDO> sqlWrapper = new UpdateWrapper<>();
-        sqlWrapper.lambda().set(EmergencyTaskDO::getApprovalRemarks, createReqVO.getApprovalRemarks())
+        sqlWrapper.lambda()
+                .set(EmergencyTaskDO::getApprovalRemarks, createReqVO.getApprovalRemarks())
                 .set(EmergencyTaskDO::getApprovalUserId, userId)
                 .set(EmergencyTaskDO::getApprovalUserName, userName)
                 .set(EmergencyTaskDO::getBusiStatus, createReqVO.getBusiStatus())
@@ -138,8 +143,8 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
     public void updateEmergencyTask(EmergencyTaskSaveReqVO updateReqVO) {
         // 校验存在
         validateEmergencyTaskExists(updateReqVO.getTaskNo());
-        this.deleteEmergencyTaskByTaskNo(updateReqVO.getTaskNo());
-        this.createEmergencyTask(updateReqVO);
+        emergencyMachineryMapper.deleteByTaskNo(updateReqVO.getTaskNo());
+        this.createEmergencyTask(updateReqVO, false);
     }
     @Override
@@ -190,14 +195,13 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
         return emergencyTaskRespVO;
     }
-    @DataPermission(enable = true)
     @Override
     public PageResult<EmergencyTaskRespVO> getEmergencyTaskPage(EmergencyTaskPageReqVO pageReqVO) {
         Long companyId = SecurityFrameworkUtils.getCompanyId();
         //超级管理员全返回
-//        if(companyId != null && !companyId.equals(100L)){
-//            pageReqVO.setCompanyId(companyId);
-//        }
+        if(companyId != null && companyId.equals(100L)){
+           pageReqVO.setBusiStatusList(Arrays.asList(2,3,4,5));
+        }
         PageResult<EmergencyTaskDO> page = emergencyTaskMapper.selectPage(pageReqVO);
         List<EmergencyTaskDO> list = page.getList();
@@ -235,11 +239,11 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
         Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(deptIds);
         list.forEach(plan -> {
-            DeptRespDTO dept =  deptMap.get(plan.getDeptId());
-            if (dept != null) {
-                plan.setDeptName(dept.getName());
-
-            }
+//            DeptRespDTO dept =  deptMap.get(plan.getDeptId());
+//            if (dept != null) {
+//                plan.setDeptName(dept.getName());
+//
+//            }
             DeptRespDTO company =  deptMap.get(plan.getCompanyId());
             if(company != null){
                 plan.setCompanyName(company.getName());
@@ -5,6 +5,7 @@ spring:
   profiles:
     active: prod
+
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。