修改bug：计量期已审批后，未更改调差单的状态

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

@@ -987,6 +987,7 @@ public class TaskController extends BladeController {
 
                         /*修改计量期的审批状态=未上报*/
                         periodService.update(Wrappers.<MeterPeriod>lambdaUpdate().set(MeterPeriod::getApproveStatus, 0).eq(MeterPeriod::getId, periodId));
+//                        contractMeterPeriodService.update(Wrappers.<ContractMeterPeriod>lambdaUpdate().set(ContractMeterPeriod::getApproveStatus, 0).eq(ContractMeterPeriod::getId, periodId));
                         //修改报表状态，如果不存在则创建报表，因为任务要查看报表
                         this.updateStatement(Long.valueOf(periodId),2,0);
                         /*删除业务复制数据taskVO*/
@@ -1344,7 +1345,9 @@ public class TaskController extends BladeController {
                     }
                 } else {
                     taskParallel = taskParallelList.get(0);
-                    vo.setEVisaStatus(taskParallel.getEVisaStatus() == 1 ? "电签成功":(StringUtils.isBlank(taskParallel.getEVisaContent()) || "null".equals(taskParallel.getEVisaContent()))?"电签失败":taskParallel.getEVisaContent());
+                    if (taskParallel.getEVisaStatus() != null){
+                        vo.setEVisaStatus(taskParallel.getEVisaStatus() == 1 ? "电签成功":(StringUtils.isBlank(taskParallel.getEVisaContent()) || "null".equals(taskParallel.getEVisaContent()))?"电签失败":taskParallel.getEVisaContent());
+                    }
                 }
                 if (vo.getTaskStatusName().equals("已废除")) {
                     if (!"撤回成功".equals(vo.getEVisaStatus()) && !"驳回成功".equals(vo.getEVisaStatus())) {
@@ -3939,6 +3942,7 @@ public class TaskController extends BladeController {
                 jdbcTemplate.execute(uptPeriod);
                 jdbcTemplate.execute(updta);
                 jdbcTemplate.execute(upData);
+                jdbcTemplate.execute("update s_contract_material_adjust set `status` = 0 where (contract_period_id = "+ periodId +"or meter_period_id = "+ periodId +") and is_deleted = 0;");
 
                 //同时删除映射task表数据
                 deleteMapTask1 = "DELETE from s_middle_meter_apply_task where task_id = "+task.getId();

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/ContractMaterialAdjustServiceImpl.java

@@ -123,7 +123,9 @@ public class ContractMaterialAdjustServiceImpl extends BaseServiceImpl<ContractM
             throw new ServiceException("请传入合同id");
         }
         IPage<ContractMaterialAdjustVO> iPage = new Page<>(dto.getCurrent(),dto.getSize());
-        return baseMapper.page2(iPage,dto);
+        IPage<ContractMaterialAdjustVO> page = baseMapper.page2(iPage, dto);
+        page.getRecords().forEach(vo -> vo.setApproveStatus(vo.getApproveStatus() != null && vo.getApproveStatus() == 2 ? 1 : 0 ));
+        return page;
     }
 
     @Override