update

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java

@@ -2,6 +2,7 @@ package com.jero.modules.project.controller;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
@@ -66,8 +67,8 @@ public class ConditionAssessmentEOController extends JeroController<ConditionAss
 	@AutoLog(value = "任务清单-项目状态评估表-列表查询")
     @ApiOperation(value="任务清单-项目状态评估表-列表查询", notes="任务清单-项目状态评估表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<ConditionAssessmentEO>> queryList() {
-        List<ConditionAssessmentEO> list = conditionAssessmentEOService.queryList();
+	public Result<List<ConditionAssessmentEO>> queryList(@RequestParam Map<String,Object> params) {
+        List<ConditionAssessmentEO> list = conditionAssessmentEOService.queryList(params);
         return Result.OK(list);
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java

@@ -289,4 +289,12 @@ public class ProjectTaskInventoryEO implements Serializable {
     /**项目状态评估备注**/
     @TableField(exist = false)
     private String projectStatusAssessRemark;
+
+
+    /**设计符合性 责任人填写反馈意见**/
+    private String designPersonChargeFeedback;
+    /**prehomo 责任人填写反馈意见**/
+    private String prehomoPersonChargeFeedback;
+    /**验证符合性 责任人填写反馈意见**/
+    private String verifyPersonChargeFeedback;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java

@@ -61,7 +61,7 @@ public interface IConditionAssessmentEOService extends IService<ConditionAssessm
 	 *
 	 * @return
 	 */
-    List< ConditionAssessmentEO> queryList();
+    List< ConditionAssessmentEO> queryList(Map<String,Object> params);
 
 	/**
 	 * 任务清单-项目状态评估表-添加或修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java

@@ -92,8 +92,12 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl<ConditionAsses
 	 * @return
 	 */
 	@Override
-    public List<ConditionAssessmentEO> queryList() {
-        return list();
+    public List<ConditionAssessmentEO> queryList(Map<String,Object> params) {
+		String projectLawsInventoryId = (String) params.get("projectLawsInventoryId");
+		QueryWrapper<ConditionAssessmentEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId);
+		List<ConditionAssessmentEO> conditionAssessmentEOS = super.baseMapper.selectList(queryWrapper);
+		return conditionAssessmentEOS;
     }
 
 	@Override

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java

@@ -14,6 +14,7 @@ import com.jero.modules.project.util.SendMessageUtils;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -56,32 +57,39 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
     public void add(JSONObject jsonObject) {
 		ProjectTaskInventoryDetailEO taskInventoryDetail = JSONObject.parseObject(JSONObject.toJSONString(jsonObject), ProjectTaskInventoryDetailEO.class);
 
-		List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList = new ArrayList<>();
+		List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOAddList = new ArrayList<>();
+		List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOUpdateList = new ArrayList<>();
 		//分发工程师数组。
 		JSONArray distributionEngineerList = jsonObject.getJSONArray("distributionEngineerList");
 		ProjectTaskInventoryDetailEO projectTaskInventoryDetail = null;
 		for (Object distributionEngineer : distributionEngineerList) {
 			projectTaskInventoryDetail = JSONObject.parseObject(JSONObject.toJSONString(distributionEngineer), ProjectTaskInventoryDetailEO.class);
 
-			String id = UUID.randomUUID().toString().replace("-", "");
-			projectTaskInventoryDetail.setId(id);
 			projectTaskInventoryDetail.setActiProcInstId(taskInventoryDetail.getActiProcInstId());
 			projectTaskInventoryDetail.setFlowType(taskInventoryDetail.getFlowType());
 			projectTaskInventoryDetail.setMsgType(taskInventoryDetail.getMsgType());
 			projectTaskInventoryDetail.setProjectTaskInventoryId(taskInventoryDetail.getProjectTaskInventoryId());
 			projectTaskInventoryDetail.setStatus(taskInventoryDetail.getStatus());
 			projectTaskInventoryDetail.setTaskDefinitionKey(taskInventoryDetail.getTaskDefinitionKey());
-			projectTaskInventoryDetailEOList.add(projectTaskInventoryDetail);
+
+			//这个工程师被分发过.
+			if(StringUtils.isNotEmpty(projectTaskInventoryDetail.getId())){
+				projectTaskInventoryDetailEOUpdateList.add(projectTaskInventoryDetail);
+			}else {
+				String id = UUID.randomUUID().toString().replace("-", "");
+				projectTaskInventoryDetail.setId(id);
+				projectTaskInventoryDetailEOAddList.add(projectTaskInventoryDetail);
+			}
 		}
 
-		if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){
+		if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOAddList)){
 			List<String> userIdList = new ArrayList<>();
 			List<String> createByList = new ArrayList<>();
 
 			List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = new ArrayList<>();
 
 			String serialNumber = projectTaskInventoryFeedbackEOService.createSerialNumber();
-			for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) {
+			for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOAddList) {
 				QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
 				sysUserQueryWrapper.lambda().eq(SysUser::getId,projectTaskInventoryDetailEO.getUserId());
 				List<SysUser> sysUserList = sysUserService.getBaseMapper().selectList(sysUserQueryWrapper);
@@ -119,9 +127,21 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			deleteWrapper.lambda().in(ProjectTaskInventoryDetailEO::getUserId,userIdList);
 			this.baseMapper.delete(deleteWrapper);
 
-			super.saveBatch(projectTaskInventoryDetailEOList);
+			super.saveBatch(projectTaskInventoryDetailEOAddList);
 			sendMessage(taskInventoryDetail,userIdList);
 		}
+		if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOUpdateList)){
+
+			for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOUpdateList) {
+				ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO = new ProjectTaskInventoryFeedbackEO();
+				projectTaskInventoryFeedbackEO.setDeliveryRequirements(projectTaskInventoryDetailEO.getDeliveryInstructions());
+				QueryWrapper<ProjectTaskInventoryFeedbackEO> updateWrapper = new QueryWrapper<>();
+				updateWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,projectTaskInventoryDetailEO.getId());
+				projectTaskInventoryFeedbackEOService.update(projectTaskInventoryFeedbackEO,updateWrapper);
+			}
+
+			super.updateBatchById(projectTaskInventoryDetailEOUpdateList);
+		}
     }
 
 	/**