变更令相关

Signed-off-by: liuyc <56808083@qq.com>

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MidPayItemController.java

@@ -1,7 +1,6 @@
 package org.springblade.meter.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -110,8 +109,7 @@ public class MidPayItemController extends BladeController {
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "系统中期支付项分页", notes = "传入MeterMidPayItemSystem、Query")
     public R<IPage<MeterMidPayItemSystemVO>> systemPage(@RequestBody MeterMidPayItemSystem meterMidPayItemSystem, @RequestBody Query query) {
-        IPage<MeterMidPayItemSystem> pages = payItemSystemService.page(Condition.getPage(query), Condition.getQueryWrapper(meterMidPayItemSystem));
-
+        IPage<MeterMidPayItemSystem> pages = payItemSystemService.page(Condition.getPage(query), Condition.getQueryWrapper(meterMidPayItemSystem).lambda().orderByAsc(MeterMidPayItemSystem::getSort));
         Map<String, String> meterPayTypeMap = jdbcTemplate.query("SELECT dict_key,dict_value FROM blade_dict WHERE is_deleted = 0 AND code = 'meter_pay_type'", new BeanPropertyRowMapper<>(Dict.class)).stream().collect(Collectors.toMap(Dict::getDictKey, Dict::getDictValue));
         Map<String, String> meterPayAppTypeMap = jdbcTemplate.query("SELECT dict_key,dict_value FROM blade_dict WHERE is_deleted = 0 AND code = 'meter_pay_applicable_type'", new BeanPropertyRowMapper<>(Dict.class)).stream().collect(Collectors.toMap(Dict::getDictKey, Dict::getDictValue));
 
@@ -347,7 +345,9 @@ public class MidPayItemController extends BladeController {
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "项目中期支付项分页", notes = "传入MeterMidPayItemProjectDTO、Query")
     public R<IPage<MeterMidPayItemProjectVO>> projectPage(@RequestBody MeterMidPayItemProjectDTO dto, @RequestBody Query query) {
-        IPage<MeterMidPayItemProject> pages = payItemProjectService.page(Condition.getPage(query), Condition.getQueryWrapper(dto));
+        QueryWrapper<MeterMidPayItemProject> queryWrapper = Condition.getQueryWrapper(dto);
+        queryWrapper.orderByAsc("sort");
+        IPage<MeterMidPayItemProject> pages = payItemProjectService.page(Condition.getPage(query), queryWrapper);
 
         Map<String, String> meterPayTypeMap = jdbcTemplate.query("SELECT dict_key,dict_value FROM blade_dict WHERE is_deleted = 0 AND code = 'meter_pay_type'", new BeanPropertyRowMapper<>(Dict.class)).stream().collect(Collectors.toMap(Dict::getDictKey, Dict::getDictValue));
         Map<String, String> meterPayAppTypeMap = jdbcTemplate.query("SELECT dict_key,dict_value FROM blade_dict WHERE is_deleted = 0 AND code = 'meter_pay_applicable_type'", new BeanPropertyRowMapper<>(Dict.class)).stream().collect(Collectors.toMap(Dict::getDictKey, Dict::getDictValue));
@@ -542,7 +542,9 @@ public class MidPayItemController extends BladeController {
     @ApiOperationSupport(order = 16)
     @ApiOperation(value = "合同段中期支付项分页", notes = "传入MeterMidPayItemContractDTO、Query")
     public R<IPage<MeterMidPayItemContractVO>> contractPage(@RequestBody MeterMidPayItemContractDTO dto, @RequestBody Query query) {
-        IPage<MeterMidPayItemContract> pages = payItemContractService.page(Condition.getPage(query), Condition.getQueryWrapper(dto));
+        QueryWrapper<MeterMidPayItemContract> queryWrapper = Condition.getQueryWrapper(dto);
+        queryWrapper.orderByAsc("sort");
+        IPage<MeterMidPayItemContract> pages = payItemContractService.page(Condition.getPage(query), queryWrapper);
 
         Map<String, String> meterPayTypeMap = jdbcTemplate.query("SELECT dict_key,dict_value FROM blade_dict WHERE is_deleted = 0 AND code = 'meter_pay_type'", new BeanPropertyRowMapper<>(Dict.class)).stream().collect(Collectors.toMap(Dict::getDictKey, Dict::getDictValue));
         Map<String, String> meterPayAppTypeMap = jdbcTemplate.query("SELECT dict_key,dict_value FROM blade_dict WHERE is_deleted = 0 AND code = 'meter_pay_applicable_type'", new BeanPropertyRowMapper<>(Dict.class)).stream().collect(Collectors.toMap(Dict::getDictKey, Dict::getDictValue));

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -784,15 +784,11 @@ public class TaskController extends BladeController {
                             jdbcTemplate.execute("DELETE FROM s_change_token_form_task WHERE id = '" + dataId + "' AND task_id = " + taskRepealDTO.getTaskId());
                             jdbcTemplate.execute("DELETE FROM s_change_token_meter_task WHERE change_token_id = '" + dataId + "' AND task_id = " + taskRepealDTO.getTaskId());
                             jdbcTemplate.execute("DELETE FROM s_change_token_inventory_task WHERE change_token_id = '" + dataId + "' AND task_id = " + taskRepealDTO.getTaskId());
-                        }
 
-                        /*变更令直接返回，不删除文件、批注信息*/
-                        Set<String> aopParamsSet = new HashSet<>();
-                        for (String userId : taskParallelsUserIds) {
-                            String param = userId + "," + task.getProjectId() + "," + task.getContractId();
-                            aopParamsSet.add(param);
+                            /*删除单条废除的历史记录*/
+                            jdbcTemplate.execute("DELETE FROM s_task_data_update_record WHERE data_id = " + taskRepealDTO.getTaskId());
+
                         }
-                        return R.data(200, aopParamsSet, "操作成功");
                     }
 
                     /*删除文件附件、任务批注信息*/
@@ -1039,7 +1035,7 @@ public class TaskController extends BladeController {
             }
             vo.setTaskProcessInfo(taskProcessInfo);
 
-            /*中间业务taskVO复制数据（只有待审批、已审批任务才能查看到具体的taskVO复制数据，因为废除任务时taskVO被删除）*/
+            /*中间业务taskVO复制数据（只有待审批、已审批任务才能查看到具体的taskVO复制数据，因为废除任务时taskVO被删除，但是单条驳回时有记录单条数据的历史信息，所以通过的任务还是能查看到）*/
             if (ObjectUtil.isNotEmpty(task.getFormDataId()) && Arrays.asList(1, 2).contains(task.getStatus())) {
                 /*获取当条任务所有批注信息*/
                 Map<String, TaskComment> taskCommentMap = jdbcTemplate.query("SELECT * FROM s_task_comment WHERE task_id = " + id, new BeanPropertyRowMapper<>(TaskComment.class))
@@ -1124,8 +1120,8 @@ public class TaskController extends BladeController {
                         }
                     }
 
-                    /*只有在当前任务状态为已通过、已废除时，再去查询获取历史记录进行追加（已废除任务由于删除了taskVO数据；已通过任务会去删除单条驳回的数据；导致查看不到，所以需要获取保存的历史记录）*/
-                    if (Arrays.asList(2, 3).contains(task.getStatus())) {
+                    /*已审批的任务才会去追加查看，单条驳回的历史记录信息*/
+                    if (task.getStatus().equals(2)) {
                         //2.单条驳回显示（历史记录）data_id=id=taskId
                         List<TaskDataUpdateRecord> query = jdbcTemplate.query("SELECT * FROM s_task_data_update_record WHERE data_id = " + id, new BeanPropertyRowMapper<>(TaskDataUpdateRecord.class));
                         if (query.size() > 0) {
@@ -1168,7 +1164,6 @@ public class TaskController extends BladeController {
                             }
                         }
                     }
-
                     vo.setTaskCenterDataInfo(changeTokenFormTaskVOS);
                 }
             }
@@ -1955,31 +1950,32 @@ public class TaskController extends BladeController {
                             .eq(ChangeTokenFormTask::getId, dto.getDataId()));
 
                     /*变更令单条驳回后，会存在重新上报情况，需要保留驳回前的记录信息显示在旧任务中，那么需要存储历史记录*/
-                    /*获取变更令*/
-                    TaskDetailVO data = this.detail(dto.getTaskId()).getData();
-                    Object taskCenterDataInfo = data.getTaskCenterDataInfo();
-                    List<ChangeTokenFormTaskVO> changeTokenFormTaskVOS = (List<ChangeTokenFormTaskVO>) taskCenterDataInfo;
-                    ChangeTokenFormTaskVO changeTokenFormTaskVO = changeTokenFormTaskVOS.stream().filter(f -> f.getId().equals(Long.parseLong(dto.getDataId()))).findAny().orElse(null);
-                    if (changeTokenFormTaskVO != null) {
-                        /*获取部位、清单信息*/
-                        TaskDataDetailVO formAndBW = this.dataDetail(dto.getTaskId(), dto.getDataId()).getData();
-                        if (formAndBW != null) {
-                            /*存储历史记录*/
-                            ObjectMapper objectMapper = new ObjectMapper();
-                            String jsonStringChangeTokenFormTaskVO = objectMapper.writeValueAsString(changeTokenFormTaskVO);
-                            String jsonStringFormAndBW = objectMapper.writeValueAsString(formAndBW);
-
-                            /*此处data_id=taskId，form_id=变更令id*/
-                            String sql = "SELECT * FROM s_task_data_update_record WHERE data_id = ? AND form_id = ?";
-                            List<TaskDataUpdateRecord> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TaskDataUpdateRecord.class),
-                                    dto.getTaskId(), changeTokenFormTaskVO.getId());
-                            if (query.size() == 0) {
-                                jdbcTemplate.update("INSERT INTO s_task_data_update_record (id, data_id, form_id, raw_chang_center_data_json, raw_chang_right_data_json) VALUES (?, ?, ?, ?, ?)",
-                                        SnowFlakeUtil.getId(), dto.getTaskId(), changeTokenFormTaskVO.getId(), jsonStringChangeTokenFormTaskVO, jsonStringFormAndBW);
+                    if (dto.getAuditStatus().equals("2")) {
+                        /*获取变更令*/
+                        TaskDetailVO data = this.detail(dto.getTaskId()).getData();
+                        Object taskCenterDataInfo = data.getTaskCenterDataInfo();
+                        List<ChangeTokenFormTaskVO> changeTokenFormTaskVOS = (List<ChangeTokenFormTaskVO>) taskCenterDataInfo;
+                        ChangeTokenFormTaskVO changeTokenFormTaskVO = changeTokenFormTaskVOS.stream().filter(f -> f.getId().equals(Long.parseLong(dto.getDataId()))).findAny().orElse(null);
+                        if (changeTokenFormTaskVO != null) {
+                            /*获取部位、清单信息*/
+                            TaskDataDetailVO formAndBW = this.dataDetail(dto.getTaskId(), dto.getDataId()).getData();
+                            if (formAndBW != null) {
+                                /*存储历史记录*/
+                                ObjectMapper objectMapper = new ObjectMapper();
+                                String jsonStringChangeTokenFormTaskVO = objectMapper.writeValueAsString(changeTokenFormTaskVO);
+                                String jsonStringFormAndBW = objectMapper.writeValueAsString(formAndBW);
+
+                                /*此处data_id=taskId，form_id=变更令id*/
+                                String sql = "SELECT * FROM s_task_data_update_record WHERE data_id = ? AND form_id = ?";
+                                List<TaskDataUpdateRecord> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TaskDataUpdateRecord.class),
+                                        dto.getTaskId(), changeTokenFormTaskVO.getId());
+                                if (query.size() == 0) {
+                                    jdbcTemplate.update("INSERT INTO s_task_data_update_record (id, data_id, form_id, raw_chang_center_data_json, raw_chang_right_data_json) VALUES (?, ?, ?, ?, ?)",
+                                            SnowFlakeUtil.getId(), dto.getTaskId(), changeTokenFormTaskVO.getId(), jsonStringChangeTokenFormTaskVO, jsonStringFormAndBW);
+                                }
                             }
                         }
                     }
-
                 }
                 return R.success("操作成功");
             }
@@ -2197,12 +2193,14 @@ public class TaskController extends BladeController {
         } else if (task.getMeterTaskType().equals(4)) {
             List<String> formDataIds = Func.toStrList(formDataId);
             List<ChangeTokenFormTask> changeTokenFormTasks = changeTokenFormServiceTask.getBaseMapper().selectList(Wrappers.<ChangeTokenFormTask>lambdaQuery()
+                    .eq(ChangeTokenFormTask::getTaskId, dto.getTaskId())
                     .in(ChangeTokenFormTask::getId, formDataIds));
 
             /*修改status=1的通过的变更令数据的审批状态=已审批*/
             List<Long> ids_1 = changeTokenFormTasks.stream().filter(f -> f.getStatus().equals(1)).map(ChangeTokenFormTask::getId).collect(Collectors.toList());
             if (ids_1.size() > 0) {
                 UpdateWrapper<ChangeTokenFormTask> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("task_id", dto.getTaskId());
                 updateWrapper.in("id", ids_1);
                 ChangeTokenFormTask updateEntity = new ChangeTokenFormTask();
                 updateEntity.setApproveStatus(2);
@@ -2213,16 +2211,17 @@ public class TaskController extends BladeController {
             List<Long> ids_2 = changeTokenFormTasks.stream().filter(f -> f.getStatus().equals(2)).map(ChangeTokenFormTask::getId).collect(Collectors.toList());
             if (ids_2.size() > 0) {
                 /*原始变更令审批状态修改为=0未上报，单条驳回状态=0未选中，可重复上报*/
-                UpdateWrapper<ChangeTokenFormTask> updateWrapper = new UpdateWrapper<>();
+                UpdateWrapper<ChangeTokenForm> updateWrapper = new UpdateWrapper<>();
                 updateWrapper.in("id", ids_2);
-                ChangeTokenFormTask updateEntity = new ChangeTokenFormTask();
+                ChangeTokenForm updateEntity = new ChangeTokenForm();
                 updateEntity.setApproveStatus(0);
                 updateEntity.setStatus(0);
-                changeTokenFormServiceTask.update(updateEntity, updateWrapper);
+                changeTokenFormService.update(updateEntity, updateWrapper);
 
-                jdbcTemplate.execute("DELETE FROM s_change_token_form_task WHERE id IN(" + StringUtils.join(ids_2, ",") + ")");
-                jdbcTemplate.execute("DELETE FROM s_change_token_meter_task WHERE change_token_id IN(" + StringUtils.join(ids_2, ",") + ")");
-                jdbcTemplate.execute("DELETE FROM s_change_token_inventory_task WHERE change_token_id IN(" + StringUtils.join(ids_2, ",") + ")");
+                /*删除*/
+                jdbcTemplate.execute("DELETE FROM s_change_token_form_task WHERE task_id = " + dto.getTaskId() + " AND id IN(" + StringUtils.join(ids_2, ",") + ")");
+                jdbcTemplate.execute("DELETE FROM s_change_token_meter_task WHERE task_id = " + dto.getTaskId() + " AND change_token_id IN(" + StringUtils.join(ids_2, ",") + ")");
+                jdbcTemplate.execute("DELETE FROM s_change_token_inventory_task WHERE task_id = " + dto.getTaskId() + " AND change_token_id IN(" + StringUtils.join(ids_2, ",") + ")");
             }
 
         }