整改单提交接口修改

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceRectificationOrderServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -9,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.FileItemDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
@@ -109,28 +109,32 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
         BeanUtils.copyProperties(model, entity);
         acceptanceRectificationOrderMapper.updateById(entity);
 
-        // 触发工作流
+        // 如果整改已完成则触发工作流
+        String status = entity.getRectificationStatus();
+        if (String.valueOf(RectificationStatusEnum.整改已完成.getCode()).equals(status)) {
             BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(
                     Wrappers.<BasicGridAcceptance>lambdaQuery()
                             .eq(BasicGridAcceptance::getPeasantHouseholdId, entity.getPeasantHouseholdId())
             );
+
             basicGridAcceptance.setAcceptanceStatus(String.valueOf(Integer.parseInt(basicGridAcceptance.getAcceptanceStatus()) - 1));
 
             StandardDto standardDto = new StandardDto();
 
             standardDto.setTaskId(basicGridAcceptance.getNextTaskId());
-//        VariableDto variableDto = new VariableDto();
-//        variableDto.setComment("approval");
-//        variableDto.setOperator(reginParams.getUserModel().getUserId());
-//        variableDto.setApprovalStatus("1");
-//        variableDto.setOperationTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-//        standardDto.setResultCode(basicGridAcceptance.getNextTaskId());
-//        standardDto.setVariable(variableDto);
-//        standardDto.setResult("1");
-        BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto,userId);
+            VariableDto variableDto = new VariableDto();
+            variableDto.setComment("approval");
+            variableDto.setOperator(reginParams.getUserModel().getUserId());
+            variableDto.setApprovalStatus("1");
+            variableDto.setOperationTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            standardDto.setResultCode("approvalStatus");
+            standardDto.setVariable(variableDto);
+            standardDto.setResult("1");
+            BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto, userId);
             BeanUtils.copyProperties(workBasicGridAcceptance, basicGridAcceptance);
 
             basicGridAcceptanceMapper.updateById(basicGridAcceptance);
-        return null;
+        }
+        return model;
     }
 }
\ No newline at end of file