Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DutyPersonShiftMapper.java

@@ -143,4 +143,5 @@ public interface DutyPersonShiftMapper extends BaseMapper<DutyPersonShift> {
     
     List<Map<String, Object>> getNewEquipmentForSpecifyDate(String dutyDate,String groupCode,String equipmentId,String equipmentName,String groupByName);
 
+    String getFirstAidCompanyId ();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DutyPersonShiftMapper.xml

@@ -390,6 +390,16 @@ WHERE
 
 </select>
 
+	<select id='getFirstAidCompanyId' resultType="string">
+		SELECT
+			sequence_nbr
+		FROM
+			cb_org_usr a
+		WHERE
+			a.is_delete = 0
+		  AND
+			a.biz_org_name = '消防救援保障部'
+	</select>
 
 <select id='getFirstAidForTypeCodeAndCompanyId' resultType="map">
 SELECT

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertSubmittedMapper.xml

@@ -150,7 +150,7 @@
     </select>
 
     <select id="getOther" resultType="Map">
-      SELECT distinct
+       SELECT distinct
         a.rec_date recDate ,
         b.company_name companyName,
         c.resources_name carName,
@@ -161,9 +161,9 @@
         LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
         LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
 
-        where a.sequence_nbr = (select sequence_nbr from jc_power_transfer where alert_called_id
+        where a.sequence_nbr in (select sequence_nbr  from (select sequence_nbr from jc_power_transfer where alert_called_id
         = #{alertId}
-        order by rec_date asc limit 1,100)
+        order by rec_date asc limit 1,100) as t )
     </select>
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/dao/entity/LatentDanger.java

@@ -90,7 +90,7 @@ public class LatentDanger extends BasicEntity {
     /**
      * 限制时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reformLimitDate;
 
     private Integer overtimeState;

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/ExecuteStateEnum.java

@@ -5,6 +5,7 @@ public enum ExecuteStateEnum {
 
     未执行("未执行", 1, ""),
     通过("通过", 2, "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": false}]}"),
+    完毕("完毕", 2, "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": false}]}"),
     驳回("驳回", 3, "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": true}]}"),
     已确认("已确认", 4, ""),
     停止执行("停止执行", 5, ""),

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/LatentDangerExcuteTypeEnum.java

@@ -7,7 +7,7 @@ public enum LatentDangerExcuteTypeEnum {
             "{\"reviewResult\": \"通过\"}"),
     隐患评审拒绝("隐患评审拒绝", 3, ExecuteStateEnum.驳回, LatentDangerStateEnum.已撤销,
             "{\"reviewResult\": \"不通过\"}"),
-    隐患常规治理("隐患常规治理", 4, ExecuteStateEnum.通过, LatentDangerStateEnum.待验证,
+    隐患常规治理("隐患常规治理", 4, ExecuteStateEnum.完毕, LatentDangerStateEnum.待验证,
             "{\"rectifyResult\": \"常规整改\"}"),
     隐患安措计划("隐患安措计划", 5, ExecuteStateEnum.通过, LatentDangerStateEnum.安措计划中,
             "{\"action\": \"complete\",\"variables\": [{\"name\": \"rectification\",\"value\": \"plan\"}]}"),

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IEquipmentAssociatedService.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.service;
 
 
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentAssociatedDto;
+
 /**
  * 配套设备/设施/部件接口类
  *
@@ -9,4 +11,5 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.service;
  */
 public interface IEquipmentAssociatedService {
 
+    EquipmentAssociatedDto updateAssociated(EquipmentAssociatedDto model);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/ContractServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
-import com.yeejoin.amos.boot.module.common.api.entity.Contract;
-import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
-import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
-import com.yeejoin.amos.boot.module.common.api.mapper.ContractMapper;
-import com.yeejoin.amos.boot.module.common.api.service.IContractService;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
-import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,10 +16,17 @@ import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
+import com.yeejoin.amos.boot.module.common.api.entity.Contract;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
+import com.yeejoin.amos.boot.module.common.api.mapper.ContractMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IContractService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
 
 /**
  * 维保合同服务实现类
@@ -53,8 +53,6 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
             MaintenanceCompany company = maintenanceCompanyService.getMaintenanceCompany(amosUserId);
             companyId = company.getSequenceNbr();
         }
-        
-        //
         Page<ContractDto>  resultPage= queryForContractPageByParam(page, isDelete, companyId, signedCompanyId, name, typeCode,
                 signedDate);
         List<ContractDto>  resultContractDtos=    resultPage.getRecords();

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyFirstAidServiceImpl.java

@@ -124,6 +124,11 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 		List< Map<String, Object>> result = new ArrayList<Map<String, Object>>();
 		List<String> userNameList= new ArrayList<String>();
 
+		String firstAidCompanyId = dutyPersonShiftMapper.getFirstAidCompanyId();
+		if (firstAidCompanyId != "" && firstAidCompanyId != null){
+			ids.add(firstAidCompanyId);
+		}
+		
 		List<String> firstAidSimpleList = new ArrayList<String>();
 		List<String> companyNameList = new ArrayList<String>();
 		String typeString = "JJZ";

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -643,7 +643,7 @@ public class MaintenanceCompanyServiceImpl
         MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
         if (ValidationUtil.isEmpty(seq)) {
             maintenanceCompany = getMaintenanceCompany(amosUserId);
-            seq = maintenanceCompany.getParentId();
+            seq = maintenanceCompany.getSequenceNbr();
         }
         // 机场单位列表基本信息
         if (pageNum == -1 || pageSize == -1) {
@@ -675,11 +675,11 @@ public class MaintenanceCompanyServiceImpl
         LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>();
         wrapper.eq(MaintenanceCompany::getIsDelete, false);
         wrapper.eq(MaintenanceCompany::getAmosId, amosUserId);
-        MaintenanceCompany maintenanceCompany = this.baseMapper.selectOne(wrapper);
+        MaintenanceCompany maintenancePerson = this.baseMapper.selectOne(wrapper);
 //		DynamicFormInstance dyFormInstance = dynamicFormInstanceService.getOne(
 //				new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "amosAccount")
 //						.eq(DynamicFormInstance::getFieldValue, amosUserId));
-        if (ValidationUtil.isEmpty(maintenanceCompany)) {
+        if (ValidationUtil.isEmpty(maintenancePerson)) {
             throw new BadRequest("维保账号不存在或未关联系统账号.");
         }
 //		MaintenanceCompany person = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
@@ -687,11 +687,11 @@ public class MaintenanceCompanyServiceImpl
 //		if (ValidationUtil.isEmpty(person)) {
 //			throw new BadRequest("维保账号不存在或未关联系统账号.");
 //		}
-//		maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
-//				.eq(MaintenanceCompany::getSequenceNbr, person.getParentId()));
-//		if (ValidationUtil.isEmpty(maintenanceCompany)) {
-//			throw new BadRequest("维保账号不存在或未关联系统账号.");
-//		}
+        MaintenanceCompany	maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
+				.eq(MaintenanceCompany::getSequenceNbr, maintenancePerson.getParentId()));
+		if (ValidationUtil.isEmpty(maintenanceCompany)) {
+			throw new BadRequest("维保公司不存在或未关联系统账号.");
+		}
         return maintenanceCompany;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MaintenanceResourceServiceImpl.java

@@ -179,8 +179,8 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
     public List<MaintenanceResourceDto> findTreeById(Long id) {
         List<MaintenanceResourceDto> list = maintenanceResourceMapper.findTreeById(id);
         if (!CollectionUtils.isEmpty(list)) {
-            List<MaintenanceResourceDto> dtoList = TreeNodeUtil.assembleTreeNotFilter(list);
-            List<MaintenanceResourceDto> collect = dtoList.stream().filter(x -> !MaintenanceResourceEnum.CLASSIFY.getValue().equals(x.getType())).collect(Collectors.toList());
+            List<MaintenanceResourceDto> dtoList = TreeNodeUtil.assembleTreeNotFilter(list);//&& x.getId().equals(Long.toString(id)) 这一段用于生成树之后并没有把树子节点数据从list列表删除造成的脏数据的问题 by chenhao 2022-01-12
+            List<MaintenanceResourceDto> collect = dtoList.stream().filter(x -> !MaintenanceResourceEnum.CLASSIFY.getValue().equals(x.getType()) && x.getId().equals(Long.toString(id))).collect(Collectors.toList());
             return collect;
         }
         return Lists.newArrayList();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AircraftServiceImpl.java

@@ -121,7 +121,7 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
         String aircraft = "";
         List<AlertFormValue> list1 =  list.stream().filter(formValue -> formValue.getFieldCode().equals("aircraft") || formValue.getFieldCode().equals("aircraftModel")).collect(Collectors.toList());
         if(list1.size() > 0) {
-            if(ValidationUtil.isEmpty(list1.get(0).getFieldValue())) {
+            if(!ValidationUtil.isEmpty(list1.get(0).getFieldValue())) {
                 aircraft = list1.get(0).getFieldValue();
             } else {
                 aircraft = list1.get(0).getFieldValueCode();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -35,7 +35,10 @@ import org.apache.poi.xwpf.usermodel.XWPFTable;
 import org.apache.poi.xwpf.usermodel.XWPFTableRow;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttPersistenceException;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STJc.Enum;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STVerticalJc;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -834,7 +837,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         List<Map<String, Object>> first = alertSubmittedMapper.getFirst(alertCalled.getSequenceNbr());
 
         // 查询后续调派
-        List<Map<String, Object>> other = alertSubmittedMapper.getFirst(alertCalled.getSequenceNbr());
+        List<Map<String, Object>> other = alertSubmittedMapper.getOther(alertCalled.getSequenceNbr());
 
         LinkedList<AlertCalledPowerInfoDto> list = new LinkedList<>();
         for(int i = 0; i <first.size(); i++) {
@@ -858,8 +861,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         for(int i = 0; i <other.size(); i++) {
             AlertCalledPowerInfoDto dto = new AlertCalledPowerInfoDto();
 
-            handleFunc(dto,first.get(i));
-            LocalDateTime dateTime =  (LocalDateTime)first.get(i).get("recDate");
+            handleFunc(dto,other.get(i));
+            LocalDateTime dateTime =  (LocalDateTime)other.get(i).get("recDate");
             Date date = Date.from(dateTime.toInstant(ZoneOffset.of("+8")));
 
             dto.setArriveTime((DateUtils.dateFormat(date,DateUtils.HOUR_PATTERN)));
@@ -1101,18 +1104,15 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         if (!ValidationUtil.isEmpty(dangerList)) {
             firstSize = dangerList.get(0).getCellDatas().get(5).getRenderData().getText();
             int fSizs = Integer.parseInt(firstSize);
+            dangerList.get(0).getCellDatas().get(5).getRenderData().setText("");
 
             // 表格渲染和列表数据下标相反，需要翻转一下列表
             List<RowRenderData> reverseList = Lists.reverse(dangerList);
-            table.removeRow(dangerListDataStartRow);
+             table.removeRow(dangerListDataStartRow);
             // 循环插入行
             int listLength = dangerList.size();
             for (int i = 0; i < fSizs; i++) {
                 if(i == 0) {
-                    TableStyle tableStyle = new TableStyle();
-                    tableStyle.setAlign(Enum.forInt(2));
-                    reverseList.get(i).getCellDatas().get(0).setCellStyle(tableStyle);
-                    reverseList.get(i).getCellDatas().get(0).getRenderData().setText("增\n援\n力\n量");
                     Style style = new Style();
                     style.setFontFamily("宋体");
                     style.setFontSize(12);
@@ -1132,23 +1132,43 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 MiniTableRenderPolicy.Helper.renderRow(table, dangerListDataStartRow, reverseList.get(i));
             }
 
+
             for (int i = fSizs; i < listLength  ; i++) {
-              reverseList.get(i).getCellDatas().forEach(cellRenderData -> {
-                        Style style = new Style();
-                        style.setFontFamily("仿宋");
-                        style.setFontSize(12);
-                        cellRenderData.getRenderData().setStyle(style);
-                    });
+
+                TableStyle tableStyle = new TableStyle();
+                tableStyle.setAlign(Enum.forInt(2));
+                reverseList.get(i).getCellDatas().get(0).setCellStyle(tableStyle);
+                reverseList.get(i).getCellDatas().get(0).getRenderData().setText("增\n援\n力\n量");
+                Style style = new Style();
+                style.setFontFamily("宋体");
+                style.setFontSize(12);
+                style.setBold(true);
+                reverseList.get(i).getCellDatas().get(0).getRenderData().setStyle(style);
+//                  reverseList.get(i).getCellDatas().forEach(cellRenderData -> {
+//                            Style style = new Style();
+//                            style.setFontFamily("仿宋");
+//                            style.setFontSize(12);
+//                            cellRenderData.getRenderData().setStyle(style);
+//                   });
                 XWPFTableRow insertNewTableRow = table.insertNewTableRow(dangerListDataStartRow);
                 IntStream.range(5,14).forEach(j -> insertNewTableRow.createCell());
                 MiniTableRenderPolicy.Helper.renderRow(table, dangerListDataStartRow, reverseList.get(i));
             }
 
-            TableTools.mergeCellsVertically(table, 0, 0, fSizs + 1);
+            TableTools.mergeCellsVertically(table, 0, 0, fSizs+1);
 
-            if(listLength - fSizs > 1 ) {
-                TableTools.mergeCellsVertically(table, 0, fSizs + 2 , listLength + 1);
+            if(fSizs == 1 && (listLength - fSizs > 1)) {
+                TableTools.mergeCellsVertically(table, 0, fSizs +2 , fSizs + 2 + (listLength - fSizs -1));
             }
+
+            if(fSizs > 1 && (listLength - fSizs > 1)) {
+                TableTools.mergeCellsVertically(table, 0, fSizs +2, fSizs + 2 + (listLength - fSizs -1));
+            }
+            XWPFTableRow xwpfTableRow = table.getRows().get(fSizs +2);
+            CTTc ctTc = xwpfTableRow.getTableCells().get(0).getCTTc();
+            CTTcPr ctTcPr = ctTc.addNewTcPr();
+            ctTcPr.addNewVAlign().setVal(STVerticalJc.CENTER);
+
         }
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -98,17 +98,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.yeejoin.amos.latentdanger.business.util.RandomUtil.buildOrderNo;
@@ -252,7 +242,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             if (ValidationUtil.isEmpty(dangerTypeEnum)) {
                 throw new Exception("检查类型参数有误");
             }
-
+            Date endTime = this.GetTargetEndTime(param.getReformLimitDate());
+            param.setReformLimitDate(endTime);
             // 保存隐患
             LatentDanger latentDanger = saveLatentDanger(param, userId, departmentId, businessKey, orgCode,
                     dangerTypeEnum);
@@ -327,6 +318,16 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 //        riskFactorMapper.updateControlStatus(riskFactorBo);
 //    }
 
+    public static Date GetTargetEndTime(Date target) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(target);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        Date end = calendar.getTime();
+        return end;
+    }
+
     // TODO 使用远程调用替换
     private void updateCheckInputDangerState(Long id, int code) {
         latentDangerMapper.updateCheckInputDangerState(id, code);
@@ -370,18 +371,18 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         Bean.copyExistPropertis(dangerDto, latentDanger);
         if (ValidationUtil.isEmpty(dangerDto.getId())) {
             // 新增
-            latentDanger.setBusinessKey(businessKey == null?"":businessKey);
-            latentDanger.setDiscovererDepartmentId(departmentId == null?"":departmentId);
-            latentDanger.setDiscovererUserId(userId == null?"": userId);
-            latentDanger.setOrgCode(orgCode == null?"":orgCode);
-            latentDanger.setDangerType(dangerTypeEnum.getCode() == null?"":dangerTypeEnum.getCode());
-            latentDanger.setDangerTypeName(dangerTypeEnum.getName() == null?"":dangerTypeEnum.getName());
+            latentDanger.setBusinessKey(businessKey == null ? "" : businessKey);
+            latentDanger.setDiscovererDepartmentId(departmentId == null ? "" : departmentId);
+            latentDanger.setDiscovererUserId(userId == null ? "" : userId);
+            latentDanger.setOrgCode(orgCode == null ? "" : orgCode);
+            latentDanger.setDangerType(dangerTypeEnum.getCode() == null ? "" : dangerTypeEnum.getCode());
+            latentDanger.setDangerTypeName(dangerTypeEnum.getName() == null ? "" : dangerTypeEnum.getName());
             if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
-                latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode() == null?"":LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode() );
-                latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName() == null?"":LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName());
+                latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode() == null ? "" : LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
+                latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName() == null ? "" : LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName());
             } else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
-                latentDanger.setDangerState(LatentDangerState.PatrolDangerStateEnum.待评审.getCode() == null?"":LatentDangerState.PatrolDangerStateEnum.待评审.getCode());
-                latentDanger.setDangerStateName(LatentDangerState.PatrolDangerStateEnum.待评审.getName() == null?"":LatentDangerState.PatrolDangerStateEnum.待评审.getName() );
+                latentDanger.setDangerState(LatentDangerState.PatrolDangerStateEnum.待评审.getCode() == null ? "" : LatentDangerState.PatrolDangerStateEnum.待评审.getCode());
+                latentDanger.setDangerStateName(LatentDangerState.PatrolDangerStateEnum.待评审.getName() == null ? "" : LatentDangerState.PatrolDangerStateEnum.待评审.getName());
             }
             if (ValidationUtil.isEmpty(dangerDto.getDangerName())) {
                 latentDanger.setDangerName(dangerDto.getInputItemName());
@@ -1773,7 +1774,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 
 
     @Override
-    public  Set<Map<String, String>> getAllDangerState() {
+    public Set<Map<String, String>> getAllDangerState() {
         Set<Map<String, String>> levelList = new HashSet<Map<String, String>>();
         List<LatentDangerState.SupervisionDangerStateEnum> supervisionDangerStateList = Lists.newArrayList(LatentDangerState.SupervisionDangerStateEnum.values());
         List<LatentDangerState.PatrolDangerStateEnum> patrolDangerStateEnumList = Lists.newArrayList(LatentDangerState.PatrolDangerStateEnum.values());
@@ -2129,9 +2130,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             lambdaQueryWrapper.le(LatentDanger::getCreateDate, searchParam.getEndTime());
         }
         lambdaQueryWrapper.and(o ->
-            o.likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "*")
-            .or().likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "-")
-            .or().eq(LatentDanger::getOrgCode, searchParam.getOrgCode()));
+                o.likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "*")
+                        .or().likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "-")
+                        .or().eq(LatentDanger::getOrgCode, searchParam.getOrgCode()));
         List<LatentDanger> latentDangerList = this.baseMapper.selectList(lambdaQueryWrapper);
         if (!ValidationUtil.isEmpty(latentDangerList)) {
             // 防火监督报告用该字段（复核执行人名称）
@@ -2145,7 +2146,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                             LatentDangerState.SupervisionDangerStateEnum::getCode);
                     stateSet.addAll(stateList);
                     List<LatentDangerFlowRecordBo> firstRecord =
-                             recordList.stream().filter(r -> LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode().equals(r.getActionFlag())).collect(Collectors.toList());
+                            recordList.stream().filter(r -> LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode().equals(r.getActionFlag())).collect(Collectors.toList());
                     danger.setCheckUserName(firstRecord.get(0).getExecuteUserName());
                     recordList =
                             recordList.stream().filter(r -> stateSet.contains(r.getDangerState())).collect(Collectors.toList());
@@ -2205,7 +2206,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             throw new Exception("隐患不存");
         }
         latentDangerDto.setDangerPosition(null);
-        Bean.copyExistPropertis(latentDangerDto, latentDanger);
+        //以下方法存在bug会将数值类型的默认值0拷贝到对象上造成数据覆盖
+        //Bean.copyExistPropertis(latentDangerDto, latentDanger);
+        latentDanger.setId(latentDangerDto.getId());
+        latentDanger.setFlowJson(latentDangerDto.getFlowJson());
+
         if (!ValidationUtil.isEmpty(latentDangerDto.getPhotoUrl())) {
             latentDanger.setPhotoUrls(Joiner.on(",").join(latentDangerDto.getPhotoUrl()));
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/EquipmentAssociatedController.java

@@ -2,19 +2,25 @@ package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentAssociated;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.ArrayList;
 import java.util.List;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.EquipmentAssociatedServiceImpl;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,10 +54,64 @@ public class EquipmentAssociatedController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增配套设备设施部件", notes = "新增配套设备设施部件")
 	public ResponseModel<EquipmentAssociatedDto> save(@RequestBody EquipmentAssociatedDto model) {
+		model.setIsDelete(false);
 	    model = equipmentAssociatedServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
 
+	/**
+	 * 根据sequenceNbr删除
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@DeleteMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "DELETE", value = "删除配套设施", notes = "删除配套设施")
+	public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr){
+		Boolean flag = equipmentAssociatedServiceImpl.update(new LambdaUpdateWrapper<EquipmentAssociated>().eq(EquipmentAssociated::getSequenceNbr,sequenceNbr).set(EquipmentAssociated::getIsDelete,true));
+		return ResponseHelper.buildResponse(flag);
+	}
+
+
+	/**
+	 * 根据sequenceNbr更新
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/updateAssociated")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新配套设备设施部件", notes = "根据sequenceNbr配套设备设施部件")
+	public ResponseModel<EquipmentAssociatedDto> updateAssociated(@RequestBody EquipmentAssociatedDto model) {
+		if (ValidationUtil.isEmpty(model)
+				|| ValidationUtil.isEmpty(model.getSequenceNbr())) {
+			throw new BadRequest("参数校验失败.");
+		}
+		model = equipmentAssociatedServiceImpl.updateAssociated(model);
+		return ResponseHelper.buildResponse(model);
+	}
+
+
+
+	/**
+	 * 新增配套设备/设施/部件
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET", value = "根据设备id返回配套设施信息", notes = "根据设备id返回配套设施信息")
+	public ResponseModel<List<EquipmentAssociatedDto>> getAssociatedByEquipmentId(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		List<EquipmentAssociated> entity = equipmentAssociatedServiceImpl.list(new LambdaQueryWrapper<EquipmentAssociated>().eq(EquipmentAssociated::getIsDelete,false).eq(EquipmentAssociated::getEquipmentId,sequenceNbr));
+		List<EquipmentAssociatedDto> result = new ArrayList<>();
+		entity.stream().forEach(t -> {
+			EquipmentAssociatedDto temp = new EquipmentAssociatedDto();
+			BeanUtils.copyProperties(t,temp);
+			result.add(temp);
+		});
+
+		return ResponseHelper.buildResponse(result);
+	}
+
 
 	/**
 	 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/EquipmentController.java

@@ -96,7 +96,7 @@ public class EquipmentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/updateEquipment")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新装备信息表", notes = "根据sequenceNbr更新装备信息表")
-    public ResponseModel<EquipmentDto> updateBySequenceNbrEquipment(@RequestBody EquipmentDto model) {
+    public ResponseModel<EquipmentDto> updateEquip20ment(@RequestBody EquipmentDto model) {
         if (ValidationUtil.isEmpty(model)
                 || ValidationUtil.isEmpty(model.getSequenceNbr())) {
             throw new BadRequest("参数校验失败.");

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/EquipmentAssociatedServiceImpl.java

@@ -30,4 +30,10 @@ public class EquipmentAssociatedServiceImpl extends BaseService<EquipmentAssocia
     public List<EquipmentAssociatedDto> queryForEquipmentAssociatedList()   {
         return this.queryForList("" , false);
     }
+
+    @Override
+    public EquipmentAssociatedDto updateAssociated(EquipmentAssociatedDto model) {
+        this.updateWithModel(model);
+        return model;
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/EquipmentInformServiceImpl.java

@@ -209,7 +209,6 @@ public class EquipmentInformServiceImpl extends BaseService<EquipmentInformDto,E
         // 接收告知书 更新告知书状态
         Boolean flag = false;
         EquipmentInform inform = this.getById(sequenceNbr);
-        inform.setInformStatus("9");
         flag = this.updateById(inform);
         if(flag) {
             // 更新设备相关参数
@@ -383,7 +382,6 @@ public class EquipmentInformServiceImpl extends BaseService<EquipmentInformDto,E
     @Transactional
     public Boolean acceptInform(Long sequenceNbr, ReginParams userInfo) throws Exception {
         EquipmentInformDto model = this.queryBySeq(sequenceNbr);
-        model.setInformStatus("9");
         InformWorkFlowEnum submit = InformWorkFlowEnum.接收方接收告知书;
         model.setProcessStatus(submit.getProcessStatus());
         // 流程流转