修改问题处置流程

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/ProblemTypeEnum.java

@@ -11,8 +11,8 @@ import java.util.Map;
 public enum ProblemTypeEnum {
     一般问题("一般问题","1"),
     重大问题("重大问题","2"),
-    存在问题("存在问题","1"),
-    不存在问题("不存在问题","0");
+    存在问题("存在问题","0"),
+    不存在问题("不存在问题","1");
     private String name;
     private String code;
 

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/QualityProblemDto.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 质量问题表
@@ -158,4 +159,12 @@ public class QualityProblemDto  extends BaseDto {
      */
     private String status;
 
+
+    private List solutionList;
+
+    private List reformDocList;
+
+    private List handingOpinionList;
+
+    private String reviewStatusString;
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/QualityProblemController.java

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemTypeEnum;
 import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.ProblemInitiationServiceImpl;
 import org.apache.commons.lang3.StringUtils;
@@ -17,6 +20,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.QualityProblemServiceImpl;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -144,7 +148,19 @@ public class QualityProblemController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/updateItem")
 	@ApiOperation(httpMethod = "POST", value = "更新质量问题表")
-	public ResponseModel<String> updateItem(@RequestBody QualityProblem qualityProblem,Long sequenceNbr){
+	public ResponseModel<String> updateItem(@RequestBody QualityProblemDto qualityProblemDto,Long sequenceNbr){
+		qualityProblemDto.setSolution(JSON.toJSONString(qualityProblemDto.getSolutionList()));
+		qualityProblemDto.setReformDoc(JSON.toJSONString(qualityProblemDto.getReformDocList()));
+		qualityProblemDto.setHandingOpinion(JSON.toJSONString(qualityProblemDto.getHandingOpinionList()));
+		if(!ValidationUtil.isEmpty(qualityProblemDto.getReviewStatusString())){
+			qualityProblemDto.setReviewStatus(false);
+			if(ProblemTypeEnum.不存在问题.getCode().equals(qualityProblemDto.getReviewStatusString())){
+				qualityProblemDto.setReviewStatus(true);
+			}
+		}
+
+		QualityProblem qualityProblem = new QualityProblem();
+		BeanUtils.copyProperties(qualityProblemDto,qualityProblem);
 		return ResponseHelper.buildResponse(qualityProblemServiceImpl.updateItem(qualityProblem,sequenceNbr));
 	}
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProblemInitiationServiceImpl.java

@@ -3,9 +3,6 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
@@ -14,7 +11,6 @@ import com.yeejoin.amos.boot.module.ugp.api.Enum.SMSEnum;
 import com.yeejoin.amos.boot.module.ugp.api.entity.*;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -24,7 +20,6 @@ import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.HashMap;
@@ -38,9 +33,6 @@ import java.util.Map;
 public class ProblemInitiationServiceImpl {
 
     @Autowired
-    WorkflowFeignService workflowFeignService;
-
-    @Autowired
     ProjectServiceImpl projectServiceImpl;
 
     @Autowired
@@ -104,11 +96,11 @@ public class ProblemInitiationServiceImpl {
 
     public void execute(String instanceId,QualityProblem objectd, String option){
         JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(objectd));
-        JSONObject jsonObject = workflowFeignService.getTask(instanceId);
+        AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+        JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         ProjectInitiation projectInitiation = new ProjectInitiation();
         projectInitiation.setInstanceId(instanceId);
         projectInitiation.setContext(JSON.toJSONString(objectd));
-        JSONObject dataObject = jsonObject.getJSONObject("data");
         projectInitiation.setTaskId(dataObject.getString("id"));
         projectInitiation.setTaskName(dataObject.getString("name"));
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/QualityProblemServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemProcessEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemTypeEnum;
@@ -124,7 +125,7 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
             quality.setHandingOpinion(qualityProblem.getHandingOpinion());
             quality.setHandingOpinionDesc(qualityProblem.getHandingOpinionDesc());
             quality.setReviewStatus(qualityProblem.getReviewStatus());
-            if(ProblemTypeEnum.不存在问题.getCode().equals(quality.getReviewStatus())){
+            if(quality.getReviewStatus()){
                 if(ProblemTypeEnum.一般问题.getName().equals(quality.getLevel())){
                     //执行一次
                     problemInitiationService.execute(quality.getInstanceId(),quality,"1");
@@ -143,7 +144,11 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
 
     @Override
     public QualityProblemDto getInfoBySequenceNbr(String sequenceNbr){
-        return qualityProblemMapper.getInfoBySequenceNbr(sequenceNbr);
+        QualityProblemDto qualityProblemDto = qualityProblemMapper.getInfoBySequenceNbr(sequenceNbr);
+        qualityProblemDto.setSolutionList(JSON.parseArray(qualityProblemDto.getSolution()));
+        qualityProblemDto.setReformDocList(JSON.parseArray(qualityProblemDto.getReformDoc()));
+        qualityProblemDto.setHandingOpinionList(JSON.parseArray(qualityProblemDto.getHandingOpinion()));
+        return qualityProblemDto;
     }
 
 }
\ No newline at end of file