feat(jg):维保备案列表字段调整，搜索条件调整，列表日期字段支持排序

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintenanceContractDto.java

@@ -71,6 +71,9 @@ public class JgMaintenanceContractDto extends BaseDto {
     @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date informEnd;
 
+    @ApiModelProperty(value = "维保合同开始日期-维保合同结束日期")
+    private String informStartAndEnd;
+
     @ApiModelProperty(value = "安全管理员id")
     private String maintenanceManagerId;
 
@@ -162,6 +165,15 @@ public class JgMaintenanceContractDto extends BaseDto {
 
     private String equCategory;
 
+    @ApiModelProperty(value = "设备品种")
+    private String equDefine;
+
+    @ApiModelProperty(value = "申请日期")
+    private String noticeDate;
+
+    @ApiModelProperty(value = "设备代码")
+    private String equCode;
+
     /**
      * 工作流下一节点任务id
      */
@@ -185,6 +197,6 @@ public class JgMaintenanceContractDto extends BaseDto {
     @ApiModelProperty(value = "转办后执行人的Id逗号分割")
     private String transferToUserIds;
 
-    @ApiModelProperty (value = "其他附件")
+    @ApiModelProperty(value = "其他附件")
     private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintenanceContractMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
+import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,8 +19,9 @@ import java.util.Map;
 public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceContract> {
 
     Page<JgMaintenanceContractDto> getContractList(@Param("page") Page<JgMaintenanceContract> page,
+                                                   @Param("sort") SortVo sortMap,
                                                    @Param("contractDto") JgMaintenanceContractDto contractDto,
-                                                   @Param("currentUserId")String currentUserId);
+                                                   @Param("currentUserId") String currentUserId);
 
     Boolean updateBySequenceNbr(@Param("dto") JgMaintenanceContractDto dto);
 
@@ -27,7 +29,7 @@ public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceCon
 
     Boolean deleteForBatch(@Param("ids") List<Long> ids);
 
-    void updatePromoter(@Param("id")Long id);
+    void updatePromoter(@Param("id") Long id);
 
-    List<Map<String, Object>> selectEquipList(@Param("id")Long id);
+    List<Map<String, Object>> selectEquipList(@Param("id") Long id);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgMaintenanceContractService.java

 package com.yeejoin.amos.boot.module.jg.api.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
+import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
+
 /**
  * 接口类
  *
  * @author system_generator
  * @date 2023-12-12
  */
-public interface IJgMaintenanceContractService {
+public interface IJgMaintenanceContractService extends IService<JgMaintenanceContract> {
+
+    Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, String sort, JgMaintenanceContractDto dto, ReginParams reginParams);
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml

@@ -100,58 +100,78 @@
 
     <select id="getContractList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto">
         SELECT
-        sequence_nbr,
-        apply_no,
-        status,
-        apply_status,
-        apply_date,
-        use_unit_code,
-        use_unit_name,
-        receive_org_code,
-        receive_org_name,
-        maintenance_unit_code,
-        maintenance_unit_name,
-        date_format(IFNULL(inform_start, null),'%Y-%m-%d') informStart,
-        date_format(IFNULL(inform_end, null),'%Y-%m-%d') informEnd,
-        emergency_call,
-        maintenance_24_tel,
-        equ_num,
-        create_date,
-        instance_id,
-        promoter,
-        next_execute_ids,
-        create_user_id,
-        next_execute_user_ids,
-        next_task_id
+        tjmc.sequence_nbr,
+        tjmc.apply_no,
+        tjmc.status,
+        tjmc.apply_status,
+        tjmc.apply_date,
+        tjmc.use_unit_code,
+        tjmc.use_unit_name,
+        tjmc.receive_org_code,
+        tjmc.receive_org_name,
+        tjmc.maintenance_unit_code,
+        tjmc.maintenance_unit_name,
+        tjmc.emergency_call,
+        tjmc.maintenance_24_tel,
+        tjmc.equ_num,
+        tjmc.create_date,
+        tjmc.instance_id,
+        tjmc.promoter,
+        tjmc.next_execute_ids,
+        tjmc.create_user_id,
+        tjmc.next_execute_user_ids,
+        tjmc.next_task_id,
+        ri."EQU_CODE" as equCode,
+        concat(date_format(IFNULL(inform_start, null),'%Y-%m-%d'),'  ~  ',date_format(IFNULL(inform_end, null),'%Y-%m-%d')) as  informStartAndEnd,
+        (SELECT name from tz_equipment_category ec WHERE ec.code = ri.EQU_LIST) AS equList,
+        (select name from tz_equipment_category ec WHERE ec.code = ri.EQU_CATEGORY) AS equCategory,
+        (select name from tz_equipment_category ec WHERE ec.code = ri.EQU_DEFINE) AS equDefine
         FROM
-        amos_tzs_biz.tzs_jg_maintenance_contract
+        amos_tzs_biz.tzs_jg_maintenance_contract tjmc
+        LEFT JOIN tzs_jg_maintenance_contract_eq tjmce ON tjmce.equip_transfer_id = tjmc.sequence_nbr
+        LEFT JOIN idx_biz_jg_register_info ri ON ri.record = tjmce.equ_id
         <where>
-            is_delete = 0
+            tjmc.is_delete = 0
             <if test="contractDto.applyNo != '' and contractDto.applyNo != null">
-                and apply_no like concat('%',#{contractDto.applyNo},'%')
+                and tjmc.apply_no like concat('%',#{contractDto.applyNo},'%')
             </if>
             <if test="contractDto.maintenanceUnitName != '' and contractDto.maintenanceUnitName != null">
-                and maintenance_unit_name like concat('%',#{contractDto.maintenanceUnitName},'%')
+                and tjmc.maintenance_unit_name like concat('%',#{contractDto.maintenanceUnitName},'%')
             </if>
             <if test="contractDto.useUnitName != '' and contractDto.useUnitName != null">
-                and use_unit_name like concat('%',#{contractDto.useUnitName},'%')
+                and tjmc.use_unit_name like concat('%',#{contractDto.useUnitName},'%')
+            </if>
+            <if test="contractDto.noticeDate != null">
+                and tjmc.create_date like concat('%',#{contractDto.noticeDate},'%')
             </if>
             <if test="contractDto.roleIds != null">
                 <foreach collection='contractDto.roleIds' item='role' open='and (' close=')' separator='or'>
-                    instance_status like concat('%',#{role},'%')
+                    tjmc.instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
             <if test="contractDto.status != '' and contractDto.status != null">
-                and status = #{contractDto.status}
+                and tjmc.status = #{contractDto.status}
             </if>
             <if test="contractDto.useUnitCode != '' and contractDto.useUnitCode != null">
-                and use_unit_code = #{contractDto.useUnitCode}
+                and tjmc.use_unit_code = #{contractDto.useUnitCode}
             </if>
             <if test="contractDto.maintenanceUnitCode != '' and contractDto.maintenanceUnitCode != null">
-                and maintenance_unit_code = #{contractDto.maintenanceUnitCode}
+                and tjmc.maintenance_unit_code = #{contractDto.maintenanceUnitCode}
             </if>
             <if test="contractDto.receiveOrgCode != '' and contractDto.receiveOrgCode != null">
-                and receive_org_code = #{contractDto.receiveOrgCode}
+                and tjmc.receive_org_code = #{contractDto.receiveOrgCode}
+            </if>
+            <if test="contractDto.equList != null and contractDto.equList != ''">
+                AND ri."EQU_LIST" = #{contractDto.equList}
+            </if>
+            <if test="contractDto.equCategory != null and contractDto.equCategory != ''">
+                AND ri."equ_category" = #{contractDto.equCategory}
+            </if>
+            <if test="contractDto.equDefine != null and contractDto.equDefine != ''">
+                AND ri."EQU_DEFINE" = #{contractDto.equDefine}
+            </if>
+            <if test="contractDto.equCode != null and contractDto.equCode != ''">
+                AND ri."EQU_CODE" like concat('%',#{contractDto.equCode},'%')
             </if>
             -- 数据过滤开始 ----------------------------------------------------
             <choose>
@@ -159,28 +179,32 @@
                     contractDto.maintenanceUnitCodeFilter != '' and contractDto.maintenanceUnitCodeFilter != null">
                     -- 同时有使用单位和维保单位用
                     and (
-                        use_unit_code = #{contractDto.useUnitCodeFilter}
-                        or maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter}
-                        or transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' )
+                        tjmc.use_unit_code = #{contractDto.useUnitCodeFilter}
+                        or tjmc.maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter}
+                        or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' )
                     )
                 </when>
                 <otherwise >
                     -- 只有使用单位或者维保单位用，或者都没有
                     <if test="contractDto.useUnitCodeFilter != '' and contractDto.useUnitCodeFilter != null">
-                        and (use_unit_code = #{contractDto.useUnitCodeFilter} or transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                        and (tjmc.use_unit_code = #{contractDto.useUnitCodeFilter} or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
                     </if>
                     <if test="contractDto.maintenanceUnitCodeFilter != '' and contractDto.maintenanceUnitCodeFilter != null">
-                        and (maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter} or transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                        and (tjmc.maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter} or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
                     </if>
                 </otherwise>
             </choose>
             -- 监管单位用
             <if test="contractDto.receiveOrgCodeFilter != '' and contractDto.receiveOrgCodeFilter != null">
-                and (receive_org_code = #{contractDto.receiveOrgCodeFilter} or transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                and (tjmc.receive_org_code = #{contractDto.receiveOrgCodeFilter} or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
             </if>
             -- 数据过滤结束 ----------------------------------------------------
         </where>
-        order by apply_no desc
+        ORDER BY
+        <if test="sort != null">
+            tjmc.${sort.field} ${sort.sortType},
+        </if>
+        apply_no desc
     </select>
     <select id="queryBySequenceNbr"
             resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto">
@@ -190,8 +214,7 @@
           and sequence_nbr = #{sequenceNbr}
     </select>
     <select id="selectEquipList" resultType="java.util.Map">
-        select jui.RECORD                                                             as SEQUENCE_NBR,
-               (SELECT name from tz_equipment_category where code = jri.EQU_LIST)     as EQU_LIST,
+        select jui.RECORD as SEQUENCE_NBR,
                jfi.PRODUCE_UNIT_NAME,
                jui.USE_INNER_CODE,
                jfi.FACTORY_NUM,
@@ -200,8 +223,9 @@
                jri.EQU_DEFINE,
                jri.PRODUCT_NAME,
                jri.EQU_CODE,
-               (select other.SUPERVISORY_CODE from idx_biz_jg_other_info other where other.RECORD = jui.RECORD) as SUPERVISORY_CODE,
-               (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as EQU_CATEGORY
+               (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as EQU_LIST,
+               (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as EQU_CATEGORY,
+               (select other.SUPERVISORY_CODE from idx_biz_jg_other_info other where other.RECORD = jui.RECORD) as SUPERVISORY_CODE
         from tzs_jg_maintenance_contract_eq mc
                  LEFT JOIN idx_biz_jg_use_info jui on mc.equ_id = jui.RECORD
                  LEFT JOIN idx_biz_jg_factory_info jfi on mc.equ_id = jfi.RECORD

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintenanceContractController.java

@@ -49,10 +49,10 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/saveOrSubmit")
     @ApiOperation(httpMethod = "POST", value = "新增维保合同备案", notes = "新增维保合同备案")
-    public ResponseModel<Object> save(@RequestBody Map<String,Object> model,
+    public ResponseModel<Object> save(@RequestBody Map<String, Object> model,
                                       @RequestParam(value = "submit") String submit) {
         ReginParams reginParams = getSelectedOrgInfo();
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.saveOrSubmit(submit,model, reginParams));
+        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.saveOrSubmit(submit, model, reginParams));
     }
 
 
@@ -79,7 +79,7 @@ public class JgMaintenanceContractController extends BaseController {
     @PostMapping(value = "/updateBySequenceNbr")
     @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新维保合同备案", notes = "根据sequenceNbr更新维保合同备案")
     public ResponseModel<Object> updateBySequenceNbr(@RequestBody JgMaintenanceContractDto dto,
-                                                                          @RequestParam("sequenceNbr") Long sequenceNbr) {
+                                                     @RequestParam("sequenceNbr") Long sequenceNbr) {
         dto.setSequenceNbr(sequenceNbr);
         return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateBySequenceNbr(dto));
     }
@@ -136,21 +136,21 @@ public class JgMaintenanceContractController extends BaseController {
                 true,
                 String.valueOf(map.get("nextTaskId")));
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        if (map.containsKey("formData") && !ObjectUtils.isEmpty(map.get("formData"))){
+        if (map.containsKey("formData") && !ObjectUtils.isEmpty(map.get("formData"))) {
             JgMaintenanceContract dto = new JgMaintenanceContract();
-            Map<String, Object> formData = (Map<String, Object>)map.get("formData");
+            Map<String, Object> formData = (Map<String, Object>) map.get("formData");
             BeanUtil.copyProperties(formData, dto);
             JgMaintenanceContract result = new JgMaintenanceContract();
             if (!ObjectUtils.isEmpty(dto.getMaintenanceManagerOneId())) {
                 result.setSequenceNbr(dto.getSequenceNbr());
-                //维保人员一
+                // 维保人员一
                 String[] maintenanceManagerOneInfo = dto.getMaintenanceManagerOneId().split("_");
                 result.setMaintenanceManagerOneId(maintenanceManagerOneInfo[0]);
                 result.setMaintenanceManagerOneName(maintenanceManagerOneInfo[1]);
                 result.setMaintenanceManagerOnePhone(dto.getMaintenanceManagerOnePhone());
                 result.setMaintenanceManagerOneIdNum(dto.getMaintenanceManagerOneIdNum());
 
-                //维保人员二
+                // 维保人员二
                 String[] maintenanceManagerTwoInfo = dto.getMaintenanceManagerTwoId().split("_");
                 result.setMaintenanceManagerTwoId(maintenanceManagerTwoInfo[0]);
                 result.setMaintenanceManagerTwoName(maintenanceManagerTwoInfo[1]);
@@ -172,16 +172,17 @@ public class JgMaintenanceContractController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "维保合同备案分页查询", notes = "分页查询维保合同备案")
+    @PostMapping(value = "/page")
+    @ApiOperation(httpMethod = "POST", value = "维保合同备案分页查询", notes = "分页查询维保合同备案")
     public ResponseModel<Page<JgMaintenanceContractVo>> queryForPage(@RequestParam(value = "current") int current,
-                                                                      @RequestParam(value = "size") int size,
-                                                                      Map<String,Object> map) {
+                                                                     @RequestParam(value = "size") int size,
+                                                                     @RequestParam(value = "sort", required = false) String sort,
+                                                                     @RequestBody(required = false) JgMaintenanceContractDto dto) {
         Page<JgMaintenanceContract> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
         ReginParams reginParams = getSelectedOrgInfo();
-        Page<JgMaintenanceContractVo> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, map, reginParams);
+        Page<JgMaintenanceContractVo> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, sort, dto, reginParams);
         return ResponseHelper.buildResponse(contractDtoPage);
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintenanceContractServiceImpl.java

@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
+import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
@@ -91,14 +92,14 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     /**
      * 分页查询
      */
-    public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, Map<String, Object> map, ReginParams reginParams) {
-        JgMaintenanceContractDto dto = new JgMaintenanceContractDto();
-        if (map.containsKey("jgMaintenanceContractDto")) {
-            dto = JSON.parseObject(JSON.toJSONString(map.get("jgMaintenanceContractDto")), JgMaintenanceContractDto.class);
+    public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, String sort, JgMaintenanceContractDto dto, ReginParams reginParams) {
+        if (ObjectUtils.isEmpty(dto)) {
+            dto = new JgMaintenanceContractDto();
         }
-        Page<JgMaintenanceContractDto> contractList = new Page<>();
+        Page<JgMaintenanceContractDto> contractList;
         Page<JgMaintenanceContractVo> result = new Page<>();
         CompanyBo company = reginParams.getCompany();
+        SortVo sortMap = commonService.sortFieldConversion(sort);
         Map<String, Object> companyTypeMap = jrmInstallationNoticeService.getCompanyType();
         String companyLevel = "";
         String companyType = "";
@@ -122,21 +123,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 dto.setMaintenanceUnitCodeFilter(company.getCompanyCode());
             }
         }
-        contractList = maintenanceContractMapper.getContractList(page, dto, reginParams.getUserModel().getUserId());
-//        if (MaintenanceEnum.SHIYONG.getCode().equals(phase)) {
-//            //使用单位用"使用单位统一信用代码"匹配数据
-//            dto.setUseUnitCode(company.getCompanyCode());
-//            dto.setRoleIds(null);
-//            contractList = maintenanceContractMapper.getContractList(page, dto);
-//        } else if (MaintenanceEnum.WEIBAO.getCode().equals(phase)) {
-//            //维保单位用"维保单位统一信用代码"匹配数据
-//            dto.setMaintenanceUnitCode(company.getCompanyCode());
-//            contractList = maintenanceContractMapper.getContractList(page, dto);
-//        } else if (MaintenanceEnum.JIANGUAN.getCode().equals(phase)) {
-//            //监管单位用"接收机构统一使用代码"匹配
-//            dto.setReceiveOrgCode(company.getCompanyCode());
-//            contractList = maintenanceContractMapper.getContractList(page, dto);
-//        }
+        contractList = maintenanceContractMapper.getContractList(page, sortMap, dto, reginParams.getUserModel().getUserId());
         BeanUtils.copyProperties(contractList, result);
         return result;
     }
@@ -151,16 +138,16 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         vo.setMaintenanceContract(ObjectUtils.isEmpty(dto.getMaintenanceContract()) ? null : JSON.parseArray(dto.getMaintenanceContract()));
         vo.setOtherAccessories(ObjectUtils.isEmpty(dto.getOtherAccessories()) ? null : JSON.parseArray(dto.getOtherAccessories()));
         // 非已完成状态数据显示最新的设备信息
-        if(!FlowStatusEnum.TO_BE_FINISHED.getName().equals(dto.getStatus())){
+        if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(dto.getStatus())) {
             List<Map<String, Object>> list = maintenanceContractMapper.selectEquipList(sequenceNbr);
             if (!ObjectUtils.isEmpty(list)) {
                 vo.setEquipmentLists(list);
             }
         } else {
             // 完成的显示历史表的数据
-            JSONArray objects = (JSONArray)commonService.queryHistoryDataObj(dto.getSequenceNbr());
+            JSONArray objects = (JSONArray) commonService.queryHistoryDataObj(dto.getSequenceNbr());
             // 兼容老数据
-            if(objects == null){
+            if (objects == null) {
                 List<Map<String, Object>> list = maintenanceContractMapper.selectEquipList(sequenceNbr);
                 if (!ObjectUtils.isEmpty(list)) {
                     vo.setEquipmentLists(list);
@@ -174,7 +161,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     }
 
 
-
     /**
      * 根据sequenceNbr更新数据
      *
@@ -191,7 +177,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
             // 解决并发问题：多个人同时操作一个流程（并发执行通过、驳回、撤回）
-            if(!isLocked){
+            if (!isLocked) {
                 throw new BadRequest("当前流程已经被执行！请重新打开页面查看并执行！");
             }
             // 流程执行时，状态及权限校验
@@ -218,7 +204,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
-            if(lock.isHeldByCurrentThread()){
+            if (lock.isHeldByCurrentThread()) {
                 lock.unlock();
             }
         }
@@ -313,7 +299,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
             // 解决并发问题：多个人同时操作一个流程（并发执行通过、驳回、撤回）
-            if(!isLocked){
+            if (!isLocked) {
                 throw new BadRequest("当前流程已经被执行！请重新打开页面查看并执行！");
             }
             // 流程执行时，状态及权限校验
@@ -355,7 +341,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
-            if(lock.isHeldByCurrentThread()){
+            if (lock.isHeldByCurrentThread()) {
                 lock.unlock();
             }
         }
@@ -473,7 +459,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 try {
                     boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
                     // 解决并发问题：多个人同时操作一个流程（并发执行通过、驳回、撤回）
-                    if(!isLocked){
+                    if (!isLocked) {
                         throw new BadRequest("当前流程已经被执行！请重新打开页面查看并执行！");
                     }
                     // 流程执行时，状态及权限校验
@@ -505,7 +491,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 } finally {
-                    if(lock.isHeldByCurrentThread()){
+                    if (lock.isHeldByCurrentThread()) {
                         lock.unlock();
                     }
                 }
@@ -618,7 +604,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         // 循环设备
         list.forEach(item -> {
             IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(item.getEquId());
-            if (!ObjectUtils.isEmpty(info)){
+            if (!ObjectUtils.isEmpty(info)) {
                 info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
                 info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
                 info.setMeMaster(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneName()) ? null : jgMaintenanceContract.getMaintenanceManagerOneName());