ugp问题修改

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

@@ -192,4 +192,6 @@ public class QualityProblemDto  extends BaseDto {
 
     @ApiModelProperty("意见书")
     private String submissionString;
+
+ private String reformDescID;
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/VerifyMapper.xml

@@ -62,6 +62,10 @@
         and
              pt.code  like '%${smartListDto.projectCode}%'
         </if>
+               <if test="smartListDto.sequenceNbr !='' and smartListDto.sequenceNbr != null">
+                   and
+                   vf.sequence_nbr  = #{smartListDto.sequenceNbr}
+               </if>
            </if>
 
 

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

@@ -513,7 +513,7 @@ public class ProjectController extends BaseController {
 	}
 
 	/**
-	 * 审核资料详情
+	 * 审核资料详情(安装和设计)
 	 * @param projectId
 	 * @return
 	 */
@@ -529,6 +529,22 @@ public class ProjectController extends BaseController {
 	}
 
 	/**
+	 * 审核资料详情（设计）
+	 * @param projectId
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "审核资料详情", notes = "审核资料详情")
+	@GetMapping(value = "/getDesignDetail")
+	public ResponseModel<Object> getDesignDetail(@RequestParam("projectId") Long projectId){
+		// 前端定制组件格式
+		Page<Map<String, Object>> mapPage = new Page<>();
+		List<Map<String, Object>> auditInformationDetail = projectServiceImpl.getDesignDetail(projectId);
+		mapPage.setRecords(auditInformationDetail);
+		return ResponseHelper.buildResponse(mapPage);
+	}
+
+	/**
 	 * 根据companyId查询企业下的人员列表
 	 * @param companyId
 	 * @return

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

@@ -360,7 +360,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             taskType = TaskTypeEnum.填报.getKey();
         }
         if (OverProjectFlowEnum.竣工资料审核并填写审核意见.getName().equals(project.getStatus()) || OverProjectFlowEnum.竣工资料上传确认.getName().equals(project.getStatus())) {
-            unitIds.add(superviseRule.getSuperviseDeptId());
+            unitIds.add(project.getTestingUnitId());
             taskType = TaskTypeEnum.流程.getKey();
         }
         return taskType;

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

@@ -772,6 +772,19 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         return result;
     }
 
+    public List<Map<String, Object>> getDesignDetail(Long sequenceNbr) {
+        ArrayList<Map<String, Object>> result = new ArrayList<>();
+        LambdaQueryWrapper<Attachment> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Attachment::getSourceId, sequenceNbr);
+        Attachment attachment = attachmentService.getOne(wrapper);
+        if (!ObjectUtils.isEmpty(attachment) && !ObjectUtils.isEmpty(attachment.getInfo())) {
+            Map<String, Object> map = JSON.parseObject(attachment.getInfo());
+            List<Map<String, Object>> designSubForm = (List<Map<String, Object>>) map.get("designSubForm");
+            data("subFormAttachment", designSubForm, result, attachment.getRecDate());
+        }
+        return result;
+    }
+
     private List<Map<String, Object>> data(String type, List<Map<String, Object>> data, List<Map<String, Object>> result, Date date) {
 
         data.forEach(item -> {
@@ -780,8 +793,11 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
             messageData.put(symbolKey, item.get(symbolKey));
             messageData.put("date", date);
             messageData.put("type", item.get(type));
-            List<Map<String, Object>> infoList = (List<Map<String, Object>>) item.get("info");
-            messageData.put("files", infoList);
+            messageData.put("files", new ArrayList<>());
+            if(!ValidationUtil.isEmpty(item.get("info"))) {
+                List<Map<String, Object>> infoList = (List<Map<String, Object>>) item.get("info");
+                messageData.put("files", infoList);
+            }
             messageData.put(status, item.getOrDefault("auditStatus", "1"));
             result.add(messageData);
         });

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

@@ -128,6 +128,7 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
             if (StrUtil.isNotBlank(qualityProblemDto1.getComeFrom())) {
                 qualityProblemDto1.setComeFrom(QuestionComeFromEnum.getTypeByCode(qualityProblemDto1.getComeFrom()));
             }
+            qualityProblemDto1.setReformDescID(String.valueOf(qualityProblemDto1.getSequenceNbr()));
             list.add(qualityProblemDto1);
         }
         page.setRecords(list);