质量问题修改

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

 package com.yeejoin.amos.boot.module.ugp.api.dto;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -74,6 +76,7 @@ public class QualityProblemDto  extends BaseDto {
     @ApiModelProperty(value = "整改书说明")
     private String reformDesc;
 
+    @JsonFormat(pattern ="yyyy-MM-dd", timezone ="GMT+8")
     @ApiModelProperty(value = "整改期限")
     private Date reformLimitDate;
 
@@ -179,8 +182,8 @@ public class QualityProblemDto  extends BaseDto {
     private String comeFrom;
 
     @ApiModelProperty("系统联络单")
-    private String systemContactSheet;
+    private JSONArray systemContactSheet;
 
     @ApiModelProperty("意见书")
-    private String submission;
+    private JSONArray submission;
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/QualityProblem.java

 package com.yeejoin.amos.boot.module.ugp.api.entity;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -128,6 +130,7 @@ public class QualityProblem extends BaseEntity {
      * 整改期限
      */
 	@TableField("reform_limit_date")
+    @JsonFormat(pattern ="yyyy-MM-dd", timezone ="GMT+8")
     private Date reformLimitDate;
 
     /**

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

@@ -208,19 +208,27 @@ public class QualityProblemController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@RequestMapping(value = "/manualProcessingStart", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "启动人工处置流程", notes = "启动人工处置流程")
-	public ResponseModel<Object> manualProcessingStart(@RequestBody QualityProblem qualityProblem,
+	public ResponseModel<Object> manualProcessingStart(@RequestBody QualityProblemDto qualityProblemDto,
 													   @RequestParam("status") String status,
 													   @RequestParam("type") String type) {
 
+		QualityProblem qualityProblem = new QualityProblem();
+		BeanUtils.copyProperties(qualityProblemDto, qualityProblem, "systemContactSheet", "submission");
+		qualityProblem.setSystemContactSheet(JSON.toJSONString(qualityProblemDto.getSystemContactSheet()));
+		qualityProblem.setSubmission(JSON.toJSONString(qualityProblemDto.getSubmission()));
 		return ResponseHelper.buildResponse(problemInitiationService.manualProcessingStart(qualityProblem, status, type));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@RequestMapping(value = "/manualProcessingExecute", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "执行人工处置流程", notes = "执行人工处置流程")
-	public ResponseModel<String> manualProcessingExecute(@RequestBody QualityProblem qualityProblem,
+	public ResponseModel<String> manualProcessingExecute(@RequestBody QualityProblemDto qualityProblemDto,
 														 @RequestParam("status") String status,
 														 @RequestParam(required = false, value = "instanceId") String instanceId) {
+		QualityProblem qualityProblem = new QualityProblem();
+		BeanUtils.copyProperties(qualityProblemDto, qualityProblem, "systemContactSheet", "submission");
+		qualityProblem.setSystemContactSheet(JSON.toJSONString(qualityProblemDto.getSystemContactSheet()));
+		qualityProblem.setSubmission(JSON.toJSONString(qualityProblemDto.getSubmission()));
 		problemInitiationService.manualProcessingExecute(qualityProblem.getInstanceId(), qualityProblem, status);
 		return ResponseHelper.buildResponse("ok");
 	}

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

@@ -2,8 +2,10 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.core.util.StrUtil;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemProcessEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemTypeEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.QuestionComeFromEnum;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.QualityProblemMapper;
@@ -123,6 +125,9 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
                     qualityProblemDto1.setVerifyUnitName(orgService.getOrgUsrById(qualityProblemDto1.getVerifyUnitId()).getBizOrgName());
                 }
             }
+            if (StrUtil.isNotBlank(qualityProblemDto1.getComeFrom())) {
+                qualityProblemDto1.setComeFrom(QuestionComeFromEnum.getTypeByCode(qualityProblemDto1.getComeFrom()));
+            }
             list.add(qualityProblemDto1);
         }
         page.setRecords(list);