合并分支 'fix_bug_first_stage' 到 'master'

Fix bug first stage

查看合并请求 laws-nio/laws-weilai!55

jero-boot/db/蔚来标准sql/first_bug_fix_record.sql

@@ -17,4 +17,15 @@ MODIFY COLUMN `description`  varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4
 
 UPDATE `laws_weilai`.`onl_cgform_field` SET `id`='e4fe526794af4477321227f69b764b0d', `cgform_head_id`='48308196e7b04761b533dc31bc899707', `db_field_name`='description', `db_field_en_name`='Description', `db_field_txt`='描述', `order_num`='9', `db_field_name_old`=NULL, `db_is_key`='0', `db_is_null`='1', `db_type`='string', `db_length`='1000', `db_point_length`='0', `db_default_val`='', `dict_field`='', `dict_table`='', `dict_text`='', `field_show_type`='8', `field_href`='', `field_length`='120', `field_valid_type`=NULL, `field_must_input`='0', `field_extend_json`='', `field_default_value`='', `is_query`='0', `is_show_form`='1', `is_show_list`='0', `is_read_only`='0', `query_mode`='single', `main_table`='', `main_field`='', `update_by`='admin', `update_time`='2022-06-06 16:05:28', `create_time`='2022-01-21 14:41:40', `create_by`='admin', `converter`='', `query_def_val`='', `query_dict_text`='', `query_dict_field`='', `query_dict_table`='', `query_show_type`='text', `query_config_flag`='0', `query_valid_type`=NULL, `query_must_input`=NULL, `sort_flag`='0', `show_area`='1499657602378825729', `is_show_laws_list`='0', `is_show_search`='0', `is_delete`='0', `is_model`='1', `dict_id`=NULL WHERE (`id`='e4fe526794af4477321227f69b764b0d');
 
--- 2022年7月4日部署到正式环境
+-- 2022年7月4日部署到正式环境
+
+
+
+-- 2022年7月8日增加字段  未同步正式环境
+ALTER TABLE `project_laws_inventory`
+    ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `file_id`;
+ALTER TABLE `project_task_inventory`
+    ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `process_end_time`;
+
+ALTER TABLE `dummy_inventory_info`
+ADD COLUMN `buss_document_library_id` varchar(32) NULL COMMENT '文档库id' AFTER `design_remark`;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -67,6 +67,7 @@ import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
+import com.jero.modules.system.util.PDFUtils;
 import com.jero.modules.system.util.StringUtils;
 import com.jero.modules.tag.entity.OnlCgformArea;
 import com.jero.modules.tag.service.impl.OnlCgformAreaServiceImpl;
@@ -3882,6 +3883,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      */
     @Override
     public void exportExcel(Map<String, Object> map, HttpServletResponse response, HttpServletRequest request) {
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String cut = (String) map.get("cut");
         //String flag = "file"为带文件导出标识
         String flag = (String) map.get("flag");
@@ -3997,6 +3999,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                     boolean b = CosBootUtil.doesObjectExist(url);
                                     if(b){
                                         InputStream download = CosBootUtil.download(url);
+                                        if(url.endsWith(".pdf") || url.endsWith(".PDF")){
+                                            String currentTime = sdf.format(new Date());
+                                            String waterContent = loginUser.getUsername() + " " + currentTime;
+                                            File newFile = PDFUtils.PDFWatermark(download,uploadpath,ossFile.getFileName(),waterContent);
+                                            download = new FileInputStream(newFile.getPath());
+                                        }
                                         copyFile(download, fileNowPath + File.separator + ossFile.getFileName());
                                     }
                                 }
@@ -4026,6 +4034,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             IOUtils.closeQuietly(os);
             File file = new File(uploadpath + "/tempZip");
             FileUtil.deleteContents(file);
+            File fileTemp = new File(uploadpath + "/tempZip.zip");
+            FileUtil.deleteContents(fileTemp);
         }
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java

@@ -284,6 +284,9 @@ public class DummyInventoryInfoEO implements Serializable {
     @TableField(exist = false)
     private Integer pageSize;
 
+    //文档库id
+    private String bussDocumentLibraryId;
+
 
 
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml

@@ -40,5 +40,6 @@
         <result column="verify_remark" property="verifyRemark" />
         <result column="prehomo_remark" property="prehomoRemark" />
         <result column="design_remark" property="designRemark" />
+        <result column="buss_document_library_id" property="bussDocumentLibraryId" />
     </resultMap>
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java

@@ -156,6 +156,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 					dummyInventoryInfoEOTemp.setDummyInventoryBaseId(dummyInventoryInfoEO.getDummyInventoryBaseId());
 					dummyInventoryInfoEOTemp.setCreateTime(new Date());
 					dummyInventoryInfoEOTemp.setUpdateTime(new Date());
+					dummyInventoryInfoEOTemp.setBussDocumentLibraryId(bussDocumentLibraryEO.getId());
 					list.add(dummyInventoryInfoEOTemp);
 				}
 				this.saveBatch(list);

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

@@ -465,5 +465,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     @ApiModelProperty(value = "报告id")
     private String fileId;
 
+    @ApiModelProperty(value = "文档库id/标准id")
+    private String standId;
 
 }

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

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -307,4 +308,11 @@ public class ProjectTaskInventoryEO implements Serializable {
     /**法规清单创建日期，任务清单中需要根据此字段进行倒序排序**/
     @TableField(exist = false)
     private Date lawsInventoryCreateTime;
+
+    @ApiModelProperty(value = "文档库id/标准id")
+    private String standId;
+
+    /**法规清单id数组  查询使用**/
+    @TableField(exist = false)
+    private List<String> projectLawsInventoryIdList;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java

@@ -76,4 +76,11 @@ public interface ProjectTaskInventoryEOMapper extends BaseMapper<ProjectTaskInve
      */
     List<Map<String, Object>> getCertificationProgressStatisticsGroupByTerritory(@Param("projectLawsInventoryIdList") List<String> projectLawsInventoryIdList,
                                                                                  @Param("certificationProgress") String certificationProgress);
+
+    /**
+     * 查询任务清单列表
+     * @param projectTaskInventoryEO
+     * @return
+     */
+    List<ProjectTaskInventoryEO> selectProjectTaskInventoryList(@Param("projectTaskInventoryEO") ProjectTaskInventoryEO projectTaskInventoryEO);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml

@@ -19,6 +19,13 @@
         <result column="project_status_assess" property="projectStatusAssess" />
     </resultMap>
 
+    <sql id="Base_Column_List" >
+        pti.id, pti.create_by,pti.create_time,pti.update_by,pti.update_time,pti.sys_org_code,pti.project_laws_inventory_id,pti.design_status,pti.design_flow_task_status,pti.design_p_id,pti.prehomo_status,
+        pti.prehomo_flow_task_status,pti.prehomo_p_id,pti.verify_status,pti.verify_flow_task_status,pti.verify_p_id,pti.certification_progress,pti.certification_progress_remark,pti.project_status_assess,
+        pti.design_send_msg_flag,pti.design_send_msg_current_flag,pti.prehomo_send_msg_flag,pti.prehomo_send_msg_current_flag,pti.verify_send_msg_flag,pti.verify_send_msg_current_flag,
+        pti.design_person_charge_feedback,pti.prehomo_person_charge_feedback,pti.verify_person_charge_feedback,pti.process_end_time
+    </sql>
+
     <select id="getCertificationProgressStatistics" resultType="hashmap">
         select
             count(certification_progress) as "certificationProgressCount",
@@ -150,4 +157,27 @@
         and pti.certification_progress = #{certificationProgress}
         group by pli.duty_territory;
     </select>
+
+    <select id="selectProjectTaskInventoryList" resultMap="ProjectTaskInventoryEOResultMap">
+        select
+            <include refid="Base_Column_List"/>
+        from
+             project_task_inventory pti
+        left join
+             project_task_inventory_condition_assessment ptica on pti.id = ptica.project_laws_inventory_id
+        <where>
+            <if test="projectTaskInventoryEO.certificationProgress != null and projectTaskInventoryEO.certificationProgress != '' ">
+                pti.certification_progress = #{projectTaskInventoryEO.certificationProgress}
+            </if>
+            <if test="projectTaskInventoryEO.projectLawsInventoryIdList != null ">
+                and pti.project_laws_inventory_id in
+                <foreach collection="projectTaskInventoryEO.projectLawsInventoryIdList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="projectTaskInventoryEO.projectStatusAssess != null and projectTaskInventoryEO.projectStatusAssess != '' ">
+                ptica.condition_assessment = #{projectTaskInventoryEO.projectStatusAssess}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -5,6 +5,8 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ConditionAssessmentEO;
 import com.jero.modules.project.entity. ConditionAssessmentEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+
 import java.util.List;
 import java.util.Map;
 
@@ -75,7 +77,7 @@ public interface IConditionAssessmentEOService extends IService<ConditionAssessm
 	 * @param roleCode
 	 * @return
 	 */
-     ConditionAssessmentEO getProjectStatusAssess(String projectLawsInventoryId, String roleCode, LoginUser currentUser);
+     ConditionAssessmentEO getProjectStatusAssess(String projectLawsInventoryId, String roleCode, LoginUser currentUser, ProjectTaskInventoryEO projectTaskInventory);
 
 	/**
 	 * studio视角下获取项目状态评估

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ConditionAssessmentEO;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
 import com.jero.modules.project.enums.ProjectRoleEnum;
 import com.jero.modules.project.mapper.ConditionAssessmentEOMapper;
 import com.jero.modules.project.service.IConditionAssessmentEOService;
@@ -144,11 +145,14 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl<ConditionAsses
 	 * @return
 	 */
 	@Override
-	public ConditionAssessmentEO getProjectStatusAssess(String projectLawsInventoryId, String roleCode,LoginUser currentUser) {
+	public ConditionAssessmentEO getProjectStatusAssess(String projectLawsInventoryId, String roleCode, LoginUser currentUser, ProjectTaskInventoryEO projectTaskInventory) {
 		ConditionAssessmentEO result = null;
 
 		QueryWrapper<ConditionAssessmentEO> queryWrapper = new QueryWrapper<>();
 		queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId);
+		if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){
+			queryWrapper.lambda().eq(ConditionAssessmentEO::getConditionAssessment,projectTaskInventory.getProjectStatusAssess());
+		}
 
 		if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue()) || StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
 			queryWrapper.lambda().eq(ConditionAssessmentEO::getCreateBy,currentUser.getUsername());

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

@@ -245,6 +245,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
 						projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 						projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+						projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
 						projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
 					}
 				}else{
@@ -266,6 +267,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
 							projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 							projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+							projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
 							projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
 						}
 					}
@@ -280,6 +282,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
 						projectTaskInventoryEO.setId(projectTaskInventoryId);
 						projectTaskInventoryEO.setProjectLawsInventoryId(lawsInventory.getId());
+						projectTaskInventoryEO.setStandId(lawsInventory.getStandId());
 						projectTaskInventoryEOList.add(projectTaskInventoryEO);
 					});
 
@@ -334,6 +337,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			List<ProjectLawsInventoryEO> list = new ArrayList<>();
 
 			for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) {
+				String standId = bussDocumentLibraryEO.getId();
+
 				ProjectLawsInventoryEO projectLawsInventoryTemp = new ProjectLawsInventoryEO();
 				BeanUtils.copyProperties(bussDocumentLibraryEO, projectLawsInventoryTemp);
 				String projectLawsInventoryId = UUID.randomUUID().toString().replace("-", "");
@@ -343,12 +348,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				projectLawsInventoryTemp.setUpdateTime(new Date());
 				projectLawsInventoryTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 				projectLawsInventoryTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
+				projectLawsInventoryTemp.setStandId(standId);
 				list.add(projectLawsInventoryTemp);
 
 				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
 				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
 				projectTaskInventoryEO.setId(projectTaskInventoryId);
 				projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryId);
+				projectTaskInventoryEO.setStandId(standId);
 				projectTaskInventoryEOList.add(projectTaskInventoryEO);
 			}
 			super.saveBatch(list);
@@ -2001,6 +2008,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
 			int isProjectRole = checkUserRole(byId.getProjectLibraryId(), currentUser.getId(), id);
 			dataDispose(projectLawsInventoryEOList,currentUser,isProjectRole,cut);
+			dataDictDispose(projectLawsInventoryEOList,cut);
 
 			//result.put("projectLawsInventory",projectLawsInventoryEOList.get(0));
 			/*if (StringUtils.equals(operatorType, OperatorTypeEnum.TASK_AFFIRM_QUERY.getValue())) {
@@ -3856,13 +3864,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}
 
 			List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
-			idList.forEach(id -> {
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.baseMapper.selectList(updateLawsInventoryWrapper);
+			projectLawsInventoryEOList.forEach(projectLawsInventory -> {
+				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
+				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
+				projectTaskInventoryEO.setId(projectTaskInventoryId);
+				projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId());
+				projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId());
+				projectTaskInventoryEOList.add(projectTaskInventoryEO);
+			});
+			/*idList.forEach(id -> {
 				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
 				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
 				projectTaskInventoryEO.setId(projectTaskInventoryId);
 				projectTaskInventoryEO.setProjectLawsInventoryId(id);
 				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-			});
+			});*/
 			//项目任务清单数据初始化。
 			this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList);
 			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
@@ -4992,14 +5009,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
-						List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-
 					}
-				}
+                    List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
+					if(listEn.size() > 1){
+                        String infoDiffOldEn = listEn.get(0);
+                        String infoDiffNewEn = listEn.get(1);
+                        enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+                    }
+                }
 				//WVTA ID
 				if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) {
 					List<String> list = Arrays.asList(infoDiff.get("wvtaId").split(","));
@@ -5007,13 +5024,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
+						}
-						List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
+                    List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
-						String infoDiffOldEn = listEn.get(0);
+					if(listEn.size() > 1){
-						String infoDiffNewEn = listEn.get(1);
+                        String infoDiffOldEn = listEn.get(0);
-						enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+                        String infoDiffNewEn = listEn.get(1);
-					}
+                        enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-				}
+                    }
+                }
 
 				//实施类别
 				if (StringUtils.isNotBlank(infoDiff.get("implementType"))) {
@@ -5022,25 +5040,30 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
+						}
-						List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
+                    List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
-						String infoDiffOldEn = listEn.get(0);
+					if(listEn.size() > 1){
-						String infoDiffNewEn = listEn.get(1);
+                        String infoDiffOldEn = listEn.get(0);
-						enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+                        String infoDiffNewEn = listEn.get(1);
-					}
+                        enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-				}
+                    }
+                }
 
 				//在产车实施日期
 				if (StringUtils.isNotBlank(infoDiff.get("implementTimeString"))) {
 					List<String> list = Arrays.asList(infoDiff.get("implementTimeString").split(","));
-					String infoDiffOld = list.get(0);
+					if(list.size() > 1){
-					String infoDiffNew = list.get(1);
+                        String infoDiffOld = list.get(0);
+                        String infoDiffNew = list.get(1);
+                        contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                    }
 
 					List<String> listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(","));
-					String infoDiffOldEn = listEn.get(0);
+					if(listEn.size() > 1){
-					String infoDiffNewEn = listEn.get(1);
+                        String infoDiffOldEn = listEn.get(0);
-					contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+                        enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+                    }
 				}
 
 				//新车型实施日期

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

@@ -181,6 +181,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
 			QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
 			taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryIdList);
+
+			if(StringUtils.isNotEmpty(projectTaskInventoryEO.getCertificationProgress())){
+				taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getCertificationProgress,projectTaskInventoryEO.getCertificationProgress());
+			}
+			/*projectTaskInventoryEO.setProjectLawsInventoryIdList(projectLawsInventoryIdList);
+			List<ProjectTaskInventoryEO> projectTaskInventoryEOList = this.baseMapper.selectProjectTaskInventoryList(projectTaskInventoryEO);*/
 			List<ProjectTaskInventoryEO> projectTaskInventoryEOList = this.baseMapper.selectList(taskInventoryQueryWrapper);
 
 			//验证当前用户在该项目中是什么角色
@@ -207,7 +213,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					});
 				});
 
-				result = createTaskInventoryEOList(projectTaskInventoryEOList,projectTaskInventoryDetailEOList,isProjectRole,currentUser);
+				result = createTaskInventoryEOList(projectTaskInventoryEOList,projectTaskInventoryDetailEOList,isProjectRole,currentUser,projectTaskInventoryEO);
 			}
 		}
 		if(CollectionUtils.isNotEmpty(result)){
@@ -422,7 +428,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
     public List<ProjectTaskInventoryEO> createTaskInventoryEOList(List<ProjectTaskInventoryEO> projectTaskInventoryEOList,
 																  List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList,
 																  Integer isProjectRole,
-																  LoginUser currentUser)
+																  LoginUser currentUser,
+																  ProjectTaskInventoryEO projectTaskInventory)
 	{
 		List<ProjectTaskInventoryEO> result = new ArrayList<>();
 		for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOList) {
@@ -449,7 +456,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 				roleCode = ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue();
 			}
 
-			ConditionAssessmentEO projectStatusAssess = conditionAssessmentEOService.getProjectStatusAssess(projectTaskInventoryEO.getProjectLawsInventoryId(),roleCode,currentUser);
+			ConditionAssessmentEO projectStatusAssess = conditionAssessmentEOService.getProjectStatusAssess(projectTaskInventoryEO.getProjectLawsInventoryId(),roleCode,currentUser,projectTaskInventory);
 			if(projectStatusAssess != null){
 				projectTaskInventoryEO.setProjectStatusAssess(projectStatusAssess.getConditionAssessment());
 				projectTaskInventoryEO.setProjectStatusAssessRemark(projectStatusAssess.getRemark());
@@ -481,8 +488,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					 * studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
 					 * 法规工程师 / 认证工程师： 查询跟自己有关系的数据 ， 包含自己待办、已办
 					 * 其他人：查询自己待办、已办数据。
-					 */
+
 					if(isStudio || (isRegulationOwner || isHomologationEngineer)){
+					 */
+					/**
+					 * 2022-07-07修改禅道 55588问题。 只有studio可以查看所有已经启动了的流程
+					 * studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
+					 */
+					if(isStudio){
 						actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
 						if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
 							designPid = actiProcInstId;
@@ -570,8 +583,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 						projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
 						projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
 					}else {
-						projectTaskInventoryEO.setCertificationProgress("");
+						if((isRegulationOwner || isHomologationEngineer)){
-						projectTaskInventoryEO.setCertificationProgressRemark("");
+							projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
+							projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
+						}else {
+							projectTaskInventoryEO.setCertificationProgress("");
+							projectTaskInventoryEO.setCertificationProgressRemark("");
+						}
+
 						if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
 							actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
 							if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
@@ -599,7 +618,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 				}
 			}
 
-			if(StringUtils.isNotEmpty(actiProcInstId) && (isRegulationOwner || isHomologationEngineer || isStudio)){
+			/*if(StringUtils.isNotEmpty(actiProcInstId) && (isRegulationOwner || isHomologationEngineer || isStudio)){*/
+			if(StringUtils.isNotEmpty(actiProcInstId) && (isStudio)){
 				projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue());
 			}
 
@@ -608,6 +628,16 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 		if(CollectionUtils.isNotEmpty(result)){
 			result = result.stream().filter(e -> (StringUtils.equals(e.getShowFlag(),TaskStatusEnum.SHOW_FLAG.getValue()))).collect(Collectors.toList());
+			//根据当前项目状态筛选一次。
+			if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){
+				result = result.stream().filter(e -> {
+					boolean flag = false;
+					if(StringUtils.equals(e.getProjectStatusAssess(),projectTaskInventory.getProjectStatusAssess())){
+						flag = true;
+					}
+					return flag;
+				}).collect(Collectors.toList());
+			}
 		}
 		return result;
 	}

jero-web/src/common/lang/en-us.js

@@ -1092,4 +1092,7 @@ module.exports = {
   pleaseSelectStandard:'Please select a standard',
   theResponsiblePersonEmpty:'The responsible person of cannot be empty',
   theDeadlineEmpty:'The deadline of cannot be empty',
+  theDeliveryTypeCannotBeEmpty:'The delivery type of cannot be empty',
+  For:'For',
+  markedRejection:'Marked rejection',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1096,4 +1096,7 @@ module.exports = {
   pleaseSelectStandard:'请选择标准',
   theResponsiblePersonEmpty:'的责任人不能为空',
   theDeadlineEmpty:'的截止时间不能为空',
+  theDeliveryTypeCannotBeEmpty:'的交付物类型不能为空',
+  For:'针对于',
+  markedRejection:'标注的驳回意见',
 }

jero-web/src/views/processCenter/components/projectInformation.vue

@@ -13,7 +13,10 @@
               @click="urlClick(queryForm[item.value])"
               v-if="item.type == 1"
         >{{queryForm[item.value]}}</span>
-
+        <span class="text-field-right text-field-right-url"
+              @click="standardClick(queryForm)"
+              v-else-if="item.type == '4'" :title="queryForm[item.value]"
+        >{{queryForm[item.value]}}</span>
         <span class="text-field-right" v-else :title="queryForm[item.value]"
         >{{queryForm[item.value]}}</span>
       </div>
@@ -25,6 +28,7 @@
    1打开新页面
    2显示文件
    3点击事件处理\需要传点击事件
+   4标注号的跳转
 -->
 <script>
   import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
@@ -80,6 +84,15 @@
         if (val) {
           window.open(val)
         }
+      },
+      standardClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.standId
+          }
+        })
+        window.open(newUrl.href, '_blank')
       }
     }
   }

jero-web/src/views/processCenter/processForm/taskListProcess/index.vue

@@ -102,7 +102,8 @@
           {},
           {
             title: this.$t('standard'),
-            value: 'serialNumber'
+            value: 'serialNumber',
+            type:'4',
           },
           {
             title: this.$t('title'),

jero-web/src/views/projectManagement/components/TaskList.vue

@@ -14,7 +14,7 @@
           </a-col>
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
-              <div class="title-text" style="width: 64px" :title="$t('areaOfResponsibility')">
+              <div class="title-text"  :title="$t('areaOfResponsibility')">
                 <span>{{$t('areaOfResponsibility')}}</span>
               </div>
               <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
@@ -23,7 +23,50 @@
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
             </div>
           </a-col>
-          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text"  :title="$t('CertificationProgress')">
+                <span>{{$t('CertificationProgress')}}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.certificationProgress"
+                                 :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'certification_progress'"/>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('CurrentStatus')">
+                <span>{{$t('CurrentStatus')}}</span>
+              </div>
+              <a-select
+                class="box-input"
+                v-model="queryParam.projectStatusAssess"
+                :placeholder="$t('PleaseSelect')+$t('CurrentStatus')">
+                <a-select-option :value="'1'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('red') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'2'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('yellow') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'3'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('green') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'4'">
+                               <span style="display: inline-block;width: 100%">
+                                     {{ $t('blue') }}
+                                </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
@@ -53,10 +96,9 @@
         :data-source="dataSource"
         :columns="columns"
       >
-<!--        @click="standardClick(result)"-->
         <div slot="standardInformation" slot-scope="text,result" class="box-left">
           <div class="content">
-            <a class="box-content-a" :title="result.serialNumber">{{result.serialNumber}}</a>
+            <a class="box-content-a" @click="standardClick(result)" :title="result.serialNumber">{{result.serialNumber}}</a>
             <a class="box-content-buttom" :title="result.title">{{result.title}}</a>
           </div>
         </div>
@@ -420,7 +462,7 @@
         let newUrl = this.$router.resolve({
           path: '/docManage/library/detail',
           query: {
-            id:row.id
+            id:row.standId
           }
         })
         window.open(newUrl.href, '_blank')
@@ -440,14 +482,14 @@
   }
 
   .title-text {
-    width: 32px;
+    width: 64px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;
     font-size: 14px;
     margin-right: 16px;
     margin-top: 3px;
-    text-align: left;
+    text-align: right;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -455,7 +497,7 @@
 
   .box-input {
     display: inline-block;
-    width: 70%;
+    width: calc(100% - 64px);
     height: 38px;
     margin-top: 2px;
   }

jero-web/src/views/projectManagement/components/commentList.vue

@@ -20,7 +20,7 @@
       </div>
       <div class="comment-box" v-if="dataList && dataList.length > 0">
         <div class="comment-box-top-box" v-for="(item,index) in dataList" :key="index">
-          <div class="title-text">{{$t('record')+(index + 1)}}</div>
+<!--          <div class="title-text">{{$t('record')+(index + 1)}}</div>-->
           <div class="box-content">
             <div class="img-box">
               <img src="../../../assets/daiban.png" class="img" alt="">

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -30,9 +30,9 @@
                 <span>{{ $t('areaOfResponsibility') }}</span>
               </div>
               <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                         :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                          :type="'select'"
+                                 :type="'select'"
-                          :triggerChange="false" :dictCode="'duty_territory'"/>
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -226,9 +226,9 @@
                  {{text}}
               </span>
         </span>
-<!--        @click="standardClick(record)"-->
+
         <span slot="standard" slot-scope="text,record" :title="text">
-              <a class="textName">
+              <a class="textName" @click="standardClick(record)">
                  {{text}}
               </a>
         </span>
@@ -435,7 +435,7 @@
 
   export default {
     name: 'listOfRegulations',
-    props:['areaOfResponsibilityList'],
+    props: ['areaOfResponsibilityList'],
     components: {
       ImportFile,
       listAddModel,
@@ -884,51 +884,51 @@
             value: 'engineeringInterfacePerson',
             valueName: 'engineeringInterfacePersonName',
             text: this.$t('engineeringInterfacePerson')
-          },
+          }
         ],
-        listOptions:[
+        listOptions: [
           {
-            value:'Not started',
+            value: 'Not started',
-            key:'Not started',
+            key: 'Not started',
-            label:this.$t('notLaunch'),
+            label: this.$t('notLaunch')
           },
           {
-            value:'List to confirm',
+            value: 'List to confirm',
-            key:'List to confirm',
+            key: 'List to confirm',
-            label:this.$t('toBeConfirmed'),
+            label: this.$t('toBeConfirmed')
           },
           {
-            value:'Accepted',
+            value: 'Accepted',
-            key:'Accepted',
+            key: 'Accepted',
-            label:this.$t('accept'),
+            label: this.$t('accept')
           },
           {
-            value:'Rejected',
+            value: 'Rejected',
-            key:'Rejected',
+            key: 'Rejected',
-            label:this.$t('refuse'),
+            label: this.$t('refuse')
-          },
+          }
         ],
-        taskOptions:[
+        taskOptions: [
           {
-            value:'Not started',
+            value: 'Not started',
-            key:'Not started',
+            key: 'Not started',
-            label:this.$t('notLaunch'),
+            label: this.$t('notLaunch')
           },
           {
-            value:'List to confirm',
+            value: 'List to confirm',
-            key:'List to confirm',
+            key: 'List to confirm',
-            label:this.$t('toBeConfirmed'),
+            label: this.$t('toBeConfirmed')
           },
           {
-            value:'Accepted',
+            value: 'Accepted',
-            key:'Accepted',
+            key: 'Accepted',
-            label:this.$t('accept'),
+            label: this.$t('accept')
           },
           {
-            value:'Rejected',
+            value: 'Rejected',
-            key:'Rejected',
+            key: 'Rejected',
-            label:this.$t('refuse'),
+            label: this.$t('refuse')
-          },
+          }
         ],
         visibleRoleSwitching: false,
         confirmLoadingRoleSwitching: false,
@@ -945,8 +945,8 @@
         },
         detailedSuccessList: [],
         detailedWarningList: [],
-        rowKeysSuccessList:[],
+        rowKeysSuccessList: [],
-        rowKeysWarningList:[],
+        rowKeysWarningList: []
       }
     },
 
@@ -1411,25 +1411,49 @@
           for (let i = 0; i < dataSource.length; i++) {
             if (dataSource[i].inventoryAffirmStatus == 'Not started' || dataSource[i].inventoryAffirmStatus == 'Rejected') {
               if (dataSource[i].homologationEngineerId && dataSource[i].regulationOwnerId) {
-                if (dataSource[i].designDeliverableType){
+                if (dataSource[i].designDeliverableType) {
-                      if (!dataSource[i].designInitiatorId){
+                  if (!dataSource[i].designInitiatorId) {
-                        this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('designComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>)
+                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>)
-                        continue
+                    continue
-                      }
+                  }
-                }
+                  if (!dataSource[i].designDutyId) {
-                if (dataSource[i].prehomoDeliverableType){
+                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>)
-                  if (!dataSource[i].prehomoInitiatorId){
+                    continue
-                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('preHomeConfirmation')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>)
+                  }
+                  if (!dataSource[i].designDueDate) {
+                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>)
                     continue
                   }
                 }
-                if (dataSource[i].verifyDeliverableType){
+                if (dataSource[i].prehomoDeliverableType) {
-                  if (!dataSource[i].verifyInitiatorId){
+                  if (!dataSource[i].prehomoInitiatorId) {
-                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('verificationComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>)
+                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>)
+                    continue
+                  }
+                  if (!dataSource[i].prehomoDutyId) {
+                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>)
+                    continue
+                  }
+                  if (!dataSource[i].prehomoDueDate) {
+                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>)
                     continue
                   }
                 }
-                 this.detailedSuccessList.push(dataSource[i])
+                if (dataSource[i].verifyDeliverableType) {
+                  if (!dataSource[i].verifyInitiatorId) {
+                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>)
+                    continue
+                  }
+                  if (!dataSource[i].verifyDutyId) {
+                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>)
+                    continue
+                  }
+                  if (!dataSource[i].verifyDueDate) {
+                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>)
+                    continue
+                  }
+                }
+                this.detailedSuccessList.push(dataSource[i])
 
               } else {
                 this.detailedWarningList.push( < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
@@ -1438,7 +1462,7 @@
                 // return
               }
             } else {
-              this.detailedWarningList.push( < div > {dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>)
+              this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } < /div>)
               // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected'))
               // isTrue = false
               // return
@@ -1658,7 +1682,7 @@
         })
       },
 
-      getRowKeys(value,num, callBack) {
+      getRowKeys(value, num, callBack) {
         let isTrue = true
         let dataSource = []
         for (let i = 0; i < this.dataSource.length; i++) {
@@ -1694,49 +1718,58 @@
               // this.$message.warning(dataSource[i].serialNumber + this.$t('submitted'))
               // return
             }
-            if(num == 1){
+            if (num == 1) {
-              if((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId
+              if ((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId
                 && dataSource[i].designInitiatorId == this.userInfo().id) ||
                 (dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId
-                  && dataSource[i].designInitiatorId == this.userInfo().id)){
+                  && dataSource[i].designInitiatorId == this.userInfo().id)) {
-                if(!dataSource[i].designDutyId && !dataSource[i].designDueDate){
+                if (!dataSource[i].designDutyId && !dataSource[i].designDueDate) {
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
                   continue
-                }else if(!dataSource[i].designDutyId){
+                } else if (!dataSource[i].designDutyId) {
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>)
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>)
                   continue
-                }else if(!dataSource[i].designDueDate){
+                } else if (!dataSource[i].designDueDate) {
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>)
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>)
+                  continue
+                }else if (!dataSource[i].designDeliverableType) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
                   continue
                 }
               }
-              if((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId
+              if ((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId
                 && dataSource[i].prehomoInitiatorId == this.userInfo().id) ||
                 (dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId
-                  && dataSource[i].prehomoInitiatorId == this.userInfo().id)){
+                  && dataSource[i].prehomoInitiatorId == this.userInfo().id)) {
-                if(!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate){
+                if (!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate) {
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
                   continue
-                }else if(!dataSource[i].prehomoDutyId){
+                } else if (!dataSource[i].prehomoDutyId) {
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
                   continue
-                }else if(!dataSource[i].prehomoDueDate){
+                } else if (!dataSource[i].prehomoDueDate) {
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>)
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>)
+                  continue
+                }else if (!dataSource[i].prehomoDeliverableType) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
                   continue
                 }
               }
-              if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId
+              if ((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId
                 && dataSource[i].verifyInitiatorId == this.userInfo().id) ||
                 (dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId
-                  && dataSource[i].verifyInitiatorId == this.userInfo().id)){
+                  && dataSource[i].verifyInitiatorId == this.userInfo().id)) {
-                if(!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate){
+                if (!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate) {
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
                   continue
-                }else if(!dataSource[i].verifyDutyId){
+                } else if (!dataSource[i].verifyDutyId) {
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
                   continue
-                }else if(!dataSource[i].verifyDueDate){
+                } else if (!dataSource[i].verifyDueDate) {
-                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>)
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>)
+                  continue
+                }else if (!dataSource[i].verifyDeliverableType) {
+                  this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
                   continue
                 }
               }
@@ -1752,7 +1785,7 @@
 
         if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
           callBack && callBack()
-        }else{
+        } else {
           let that = this
           this.$warning({
             content: (
@@ -1768,19 +1801,19 @@
         let _this = this
         let lawsInventoryList = []
         for (let i = 0; i < this.rowKeysSuccessList.length; i++) {
-              let roleCode
+          let roleCode
-              if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id &&
+          if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id &&
-                this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) {
+            this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) {
-                roleCode = 4
+            roleCode = 4
-              } else if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id) {
+          } else if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id) {
-                roleCode = 1
+            roleCode = 1
-              } else if (this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) {
+          } else if (this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) {
-                roleCode = 2
+            roleCode = 2
-              }
+          }
-              lawsInventoryList.push({
+          lawsInventoryList.push({
-                id: this.rowKeysSuccessList[i].id,
+            id: this.rowKeysSuccessList[i].id,
-                roleCode: roleCode
+            roleCode: roleCode
-              })
+          })
         }
         let query = {
           operatorType: 1,
@@ -1799,7 +1832,7 @@
             _this.$message.warning(_this.$t('operationFailed'))
             _this.confirmLoading = false
           }
-          if(this.rowKeysWarningList && this.rowKeysWarningList.length > 0){
+          if (this.rowKeysWarningList && this.rowKeysWarningList.length > 0) {
             let that = this
             this.$warning({
               content: (
@@ -1822,13 +1855,17 @@
             onOk() {
               if (num == 0) {
                 let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-                _this.getRowKeys(selectedRowKeys, 1,function() {
+                _this.getRowKeys(selectedRowKeys, 1, function() {
                   _this.updateStatusBatch(num, selectedRowKeys)
                 })
               } else {
                 let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-                _this.getRowKeys(selectedRowKeys, 2,function() {
+                _this.getRowKeys(selectedRowKeys, 2, function() {
                   _this.visibleComment = true
+                  _this.formInlineComment = {}
+                  _this.$nextTick(()=>{
+                    _this.$refs.ruleFormComment.clearValidate()
+                  })
                 })
               }
             }
@@ -1841,8 +1878,14 @@
         this.$refs.ruleFormComment.validate(valid => {
           if (valid) {
             let url = '/project/projectCommentEO/add'
+            let content = []
+            if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
+              this.rowKeysSuccessList.forEach(res => {
+                content.push(res.serialNumber)
+              })
+            }
             let query = {
-              commentContent: this.formInlineComment.commentContent,
+              commentContent: this.$t('For')+content.join(',') + this.$t('markedRejection')+'：' + this.formInlineComment.commentContent,
               projectLibraryId: this.$route.query.id
             }
             this.confirmLoadingComment = true
@@ -1967,15 +2010,15 @@
           }
         }
       },
-      standardClick(row){
+      standardClick(row) {
         let newUrl = this.$router.resolve({
           path: '/docManage/library/detail',
           query: {
-            id:row.id
+            id: row.standId
           }
         })
         window.open(newUrl.href, '_blank')
-      },
+      }
     }
   }
 </script>