提交bug 的修改

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/dto/CheckReportDto.java

@@ -52,6 +52,9 @@ public class CheckReportDto implements Serializable {
     @ApiModelProperty(value = "是否有重大隐患（1有，0无）")
     Boolean hasMajorDanger;
 
+    @ApiModelProperty(value = "是否有重大隐患（1有，0无）")
+    String hasMajorDangerStr;
+    
     @ApiModelProperty(value = "存在安全隐患数量")
     Integer dangerCount;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

@@ -162,6 +162,26 @@ public class PlanServiceImpl implements IPlanService {
         plan.setOrgCode(orgCode);
         plan.setNextGenDate(DateUtil.getIntervalDate(new Date(), 0));
         plan.setCreateBy(userId);
+		/* 设置检查单位的去重 by 陈浩 on 2022-01-24 start  bug:4320*/
+        String checkUnitId=   plan.getCheckUnitId();
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(checkUnitId) && checkUnitId.contains(",")) {
+        	  String [] checkUnitIdStr= checkUnitId.split(",");
+        	  String checkUnitName=   plan.getCheckUnitName();
+        	  String [] checkUnitNameStr=  checkUnitName.split(",");
+        	  StringBuffer checkUnitNameStringBuffer = new StringBuffer();
+        	  checkUnitNameStringBuffer.append(checkUnitNameStr[0]);
+              String  validCheckUnitId = checkUnitIdStr[0];
+              for (int i = 1; i < checkUnitIdStr.length; i++) {
+				if(!validCheckUnitId.contains(checkUnitIdStr[i])) {
+					validCheckUnitId = validCheckUnitId+","+checkUnitIdStr[i];
+					checkUnitNameStringBuffer.append(","+checkUnitNameStr[i]);
+				}
+			}
+              plan.setCheckUnitId(validCheckUnitId);  
+              plan.setCheckUnitName(checkUnitNameStringBuffer.toString());
+        }
+      
+        /* 设置检查单位的去重 by 陈浩 on 2022-01-24 start */
         addPlanRequest.setPlan(plan);
         Route route = save(addPlanRequest);
         if (!ObjectUtils.isEmpty(route)) {

amos-boot-system-supervision/src/main/resources/db/mapper/CheckReportMapper.xml

@@ -26,6 +26,7 @@
     </select>
     <select id="selectPageList" resultType="com.yeejoin.amos.supervision.core.common.dto.CheckReportDto">
         select cr.*,
+        case when cr.has_major_danger = 1 then '有' else '无' end as hasMajorDangerStr,
         p.name planName,
         p.check_type_name planCheckType,
         p.check_level planCheckLevel