Merge branch 'dev' of http://gitlab1.renniting.cn/JCSS/urbanops into dev

颜惠青
2 parents b8496f21 b784c0fd
Showing 12 changed files with 42 additions and 26 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoUpdReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasks/AssignTasksDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/assigntasksinfo/AssignTasksInfoMapper.xml
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java
@@ -51,7 +51,7 @@ public class AssignTasksRespVO {
     private String note;
  
     @Schema(description = "派单模板文件路径（如：任务详情模板、填报表格等）")
-    private String templateFile;
+    private List templateFile;
  
     @Schema(description = "整体完成时间（仅当parent_finish=1时有值）")
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -36,7 +36,7 @@ public class AssignTasksSaveReqVO {
     private Date deadline;
  
     @Schema(description = "派单模板文件路径（如：任务详情模板、填报表格等）")
-    private String templateFile;
+    private List templateFile;
  
     @Schema(description = "任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）", requiredMode = Schema.RequiredMode.REQUIRED)
     //@NotNull(message = "任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）不能为空")
@@ -10,8 +10,6 @@ import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.Ass
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoRespVO;
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO;
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoUpdReqVO;
-import com.zteits.urbanops.module.garden.convert.AssignTaskConvert;
-import com.zteits.urbanops.module.garden.dal.dataobject.assigntasks.AssignTasksDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
 import com.zteits.urbanops.module.garden.service.assigntasks.AssignTasksService;
 import com.zteits.urbanops.module.garden.service.assigntasksinfo.AssignTasksInfoService;
@@ -21,20 +19,16 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
  
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
  
 import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
-import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getCompanyId;
  
 @Tag(name = "管理后台 - 派单任务-单位关联表（记录单位接收派单后的执行详情）")
 @RestController
@@ -95,6 +89,7 @@ public class AssignTasksInfoController {
     @Operation(summary = "获得派单任务-单位关联表（记录单位接收派单后的执行详情）分页")
     @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
     public CommonResult<PageResult<AssignTasksInfoRespVO>> getAssignTasksInfoPage(@Valid AssignTasksInfoPageReqVO pageReqVO) {
+        pageReqVO.setCompanyId(getCompanyId());
         PageResult<AssignTasksInfoDO> pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO);
 //        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
 //            return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
@@ -121,6 +116,7 @@ public class AssignTasksInfoController {
     @Operation(summary = "获得派单任务-单位关联表（记录单位接收派单后的执行详情）分页")
     @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
     public CommonResult<PageResult<AssignTasksInfoRespVO>> list(@Valid AssignTasksInfoPageReqVO pageReqVO) {
+        pageReqVO.setCompanyId(getCompanyId());
         PageResult<AssignTasksInfoDO> pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO);
 //        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
 //            return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
@@ -150,6 +146,7 @@ public class AssignTasksInfoController {
     public void exportAssignTasksInfoExcel(@Valid AssignTasksInfoPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        pageReqVO.setCompanyId(getCompanyId());
         List<AssignTasksInfoDO> list = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "派单任务-单位关联表（记录单位接收派单后的执行详情）.xls", "数据", AssignTasksInfoRespVO.class,
@@ -15,7 +15,7 @@ public class AssignTasksInfoPageReqVO extends PageParam {
  
  
     @Schema(description = "单位ID（关联单位表主键）", example = "11926")
-    private String companyId;
+    private Long companyId;
  
     @Schema(description = "填报人ID（单位指定的任务负责人）", example = "28216")
     private String writePersonId;
@@ -8,6 +8,7 @@ import lombok.Data;
  
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
  
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  
@@ -68,7 +69,7 @@ public class AssignTasksInfoRespVO {
  
     @Schema(description = "单位提交的任务文件路径（如：填报表格、现场照片等）")
     @ExcelProperty("单位提交的任务文件路径（如：填报表格、现场照片等）")
-    private String dataFile;
+    private List dataFile;
  
     @Schema(description = "催缴次数（未完成时的提醒次数）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("催缴次数（未完成时的提醒次数）")
@@ -13,6 +13,7 @@ import java.util.List;
 public class AssignTasksInfoUpdReqVO {
  
     @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12148")
+    @NotNull
     private Long id;
     @Schema(description = "驳回备注（当finish=2时，说明驳回原因）", example = "你说的对")
     private String rejectRemark;
@@ -20,6 +21,6 @@ public class AssignTasksInfoUpdReqVO {
     @Schema(description = "备注", example = "你猜")
     private String remark;
     @Schema(description = "单位提交的任务文件路径（如：填报表格、现场照片等）")
-    private List<String> dataFile;
+    private List dataFile;
  
 }
@@ -14,7 +14,7 @@ import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
  *
  * @author 超级管理员
  */
-@TableName("garden_assign_tasks")
+@TableName(value = "garden_assign_tasks", autoResultMap = true)
 @KeySequence("garden_assign_tasks_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -44,7 +44,8 @@ public class AssignTasksDO extends BaseDO {
     /**
      * 派单模板文件路径（如：任务详情模板、填报表格等）
      */
-    private String templateFile;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List templateFile;
     /**
      * 任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）
      */
@@ -16,7 +16,7 @@ import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
  *
  * @author 超级管理员
  */
-@TableName("garden_assign_tasks_info")
+@TableName(value = "garden_assign_tasks_info", autoResultMap = true)
 @KeySequence("garden_assign_tasks_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -83,7 +83,7 @@ public class AssignTasksInfoDO extends BaseDO {
      * 单位提交的任务文件路径（如：填报表格、现场照片等）
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<String> dataFile;
+    private List dataFile;
     /**
      * 催缴次数（未完成时的提醒次数）
      */
@@ -125,6 +125,7 @@ public class AssignTasksServiceImpl implements AssignTasksService {
     }
  
     @Override
+    @Transactional
     public void deleteAssignTasks(Long id) {
         // 校验存在
         validateAssignTasksExists(id);
@@ -29,10 +29,7 @@ import org.springframework.validation.annotation.Validated;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
  
 import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
@@ -117,7 +114,18 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService {
  
     @Override
     public AssignTasksInfoDO getAssignTasksInfo(Long id) {
-        return assignTasksInfoMapper.selectById(id);
+        AssignTasksInfoDO assignTasksInfoDO = assignTasksInfoMapper.selectById(id);
+        //分公司管理员查看，变为已读
+        if (assignTasksInfoDO != null) {
+            Integer newFlag = assignTasksInfoDO.getNewFlag();
+            if (newFlag != null && newFlag == 0) {
+                //更新为已读
+                assignTasksInfoDO.setNewFlag(AssignTasksConstants.ASSIGN_TASK_NEWFLAG_1);
+                assignTasksInfoDO.setNewFlagTime(LocalDateTime.now());
+                assignTasksInfoMapper.updateById(assignTasksInfoDO);
+            }
+        }
+        return assignTasksInfoDO;
     }
  
     @Override
@@ -4,16 +4,18 @@
  
  
     <!-- 按ID删除： -->
-    <delete id="deleteAssignTaskInfoByTaskId" parameterType="Long">
-        update td_assign_task_info set status= 1 where task_id in
-        <foreach item="item" collection="list" open="(" separator="," close=")">
-            #{item.id}
+    <delete id="deleteAssignTaskInfoByTaskId" parameterType="java.util.List">
+        UPDATE garden_assign_tasks_info
+        SET deleted = 1
+        WHERE task_id IN
+        <foreach item="taskId" collection="list" open="(" separator="," close=")">
+            #{taskId}
         </foreach>
     </delete>
  
     <!-- 新增：批量更新is_overdue -->
     <update id="batchUpdateIsOverdue">
-        update td_assign_task_info
+        update garden_assign_tasks_info
         set is_overdue = 1,
         update_time = now()
         where id in
@@ -114,7 +114,12 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
                 .collect(Collectors.toList());
  
         //订单号校验
+
         for (MaterialDetailDO materialDetailDO : materialDetailList) {
+            //不校验非工单类 的单号
+            if(!materialDetailDO.getSource().equals(1)){
+                continue;
+            }
             MainInfoDO mainInfoDO = mainInfoService.getMainInfoByOrderNo(materialDetailDO.getOrderNo());
             if (mainInfoDO == null) {
                 throw exception0(BAD_REQUEST.getCode(),"订单号"+materialDetailDO.getOrderNo()+"不存在");