Merge branch 'develop_tzs_register' into develop_tzs_jyjc_rule

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -188,6 +188,9 @@ public class ControllerAop {
 			mapDepartments = user.getCompanyDepartments();
 			departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null;
 		}
+		if (!ValidationUtil.isEmpty(company.getCompanyType()) && redisUtils.hasKey(RedisKey.buildReginRoleKey(RequestContext.getExeUserId()))){
+			company.setCompanyType(String.valueOf(redisUtils.get(RedisKey.buildReginRoleKey(RequestContext.getExeUserId()))));
+		}
 		Bean.copyExistPropertis(departmentM, department);
 		Map<Long, List<RoleModel>> roles = user.getOrgRoles();
 		Long sequenceNbr;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java

@@ -56,6 +56,10 @@ public class RedisKey {
      */
 	public static final String REGION_REDIS_PREFIX = "biz_";
     /**
+     * 多角色用户选择的单一角色
+     */
+    public static final String REGION_ROLE_KEY = REGION_REDIS_PREFIX + "role_";
+    /**
      * 创建区域key
      * @param token 权限
      * @return String
@@ -72,6 +76,14 @@ public class RedisKey {
     public static String buildPatternKey(String token) {
         return REGION_REDIS_PREFIX + "*" + "_" + token;
     }
+    /**
+     * 创建多角色用户选择的某一角色key
+     * @param userId 用户id
+     * @return String
+     */
+    public static String buildReginRoleKey(String userId) {
+        return REGION_ROLE_KEY + userId;
+    }
     
     /**
      * 判断str1中包含str2的个数

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -46,13 +49,17 @@ public class JgVehicleInformationDto extends BaseDto {
     private String inspectResult;
 
     @ApiModelProperty(value = "终审通过时间")
-    private Date auditPassDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
+    private String auditPassDate;
 
     @ApiModelProperty(value = "登记类别")
     private String regType;
 
     @ApiModelProperty(value = "注册登记日期")
-    private Date regDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
+    private String regDate;
 
     @ApiModelProperty(value = "注册登记人员ID")
     private String regPersonId;
@@ -93,6 +100,9 @@ public class JgVehicleInformationDto extends BaseDto {
     @ApiModelProperty(value = "使用单位统一信用代码")
     private String useUnitCreditCode;
 
+    @ApiModelProperty(value = "使用单位code：用作接收搜索条件")
+    private String useUnitCode;
+
     @ApiModelProperty(value = "检验机构代码")
     private String inspectUnitCreditCode;
 

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

@@ -23,8 +23,6 @@ public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceCon
                                                    @Param("contractDto") JgMaintenanceContractDto contractDto,
                                                    @Param("currentUserId") String currentUserId);
 
-    Boolean updateBySequenceNbr(@Param("dto") JgMaintenanceContractDto dto);
-
     JgMaintenanceContractDto queryBySequenceNbr(@Param("sequenceNbr") Long sequenceNbr);
 
     Boolean deleteForBatch(@Param("ids") List<Long> ids);

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

@@ -45,14 +45,6 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
     Page<Map<String,Object>> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page,String sort, JgMaintainNoticeDto model, ReginParams reginParams);
 
     /**
-     * 批量删除
-     *
-     * @param sequenceNbrs 主键
-     * @return 是否删除成功
-     */
-    Boolean deleteForBatch(Long[] sequenceNbrs);
-
-    /**
      * 保存维修告知单
      *
      * @param model      数据

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper">
-    <update id="updateBySequenceNbr">
-        UPDATE amos_tzs_biz.tzs_jg_maintenance_contract
-        <set>
-            <if test="dto.applyNo != null">
-                apply_no = #{dto.applyNo},
-            </if>
-            <if test="dto.applyStatus != null">
-                apply_status = #{dto.applyStatus},
-            </if>
-            <if test="dto.applyDate != null">
-                apply_date = #{dto.applyDate},
-            </if>
-            <if test="dto.equType != null">
-                equ_type = #{dto.equType},
-            </if>
-            <if test="dto.useUnitCode != null">
-                use_unit_code = #{dto.useUnitCode},
-            </if>
-            <if test="dto.useUnitName != null">
-                use_unit_name = #{dto.useUnitName},
-            </if>
-            <if test="dto.receiveOrgCode != null">
-                receive_org_code = #{dto.receiveOrgCode},
-            </if>
-            <if test="dto.receiveOrgName != null">
-                receive_org_name = #{dto.receiveOrgName},
-            </if>
-            <if test="dto.maintenanceUnitCode != null">
-                maintenance_unit_code = #{dto.maintenanceUnitCode},
-            </if>
-            <if test="dto.maintenanceUnitName != null">
-                maintenance_unit_name = #{dto.maintenanceUnitName},
-            </if>
-            <if test="dto.informStart != null">
-                inform_start = #{dto.informStart},
-            </if>
-            <if test="dto.informEnd != null">
-                inform_end = #{dto.informEnd},
-            </if>
-            <if test="dto.maintenanceManagerId != null">
-                maintenance_manager_id = #{dto.maintenanceManagerId},
-            </if>
-            <if test="dto.maintenanceManagerOneId != null">
-                maintenance_manager_one_id = #{dto.maintenanceManagerOneId},
-            </if>
-            <if test="dto.maintenanceManagerTwoId != null">
-                maintenance_manager_two_id = #{dto.maintenanceManagerTwoId},
-            </if>
-            <if test="dto.emergencyCall != null">
-                emergency_call = #{dto.emergencyCall},
-            </if>
-            <if test="dto.maintenance24Tel != null">
-                maintenance_24_tel = #{dto.maintenance24Tel},
-            </if>
-            <if test="dto.remark != null">
-                remark = #{dto.remark},
-            </if>
-            <if test="dto.isDelete != null">
-                is_delete = #{dto.isDelete},
-            </if>
-            <if test="dto.inputUnitNo != null">
-                input_unit_no = #{dto.inputUnitNo},
-            </if>
-            <if test="dto.maintenanceContract != null">
-                maintenance_contract = #{dto.maintenanceContract},
-            </if>
-            <if test="dto.maintenanceCycle != null">
-                maintenance_cycle = #{dto.maintenanceCycle},
-            </if>
-            <if test="dto.overhaulCycle != null">
-                overhaul_cycle = #{dto.overhaulCycle},
-            </if>
-            <if test="dto.equNum != null">
-                equ_num = #{dto.equNum},
-            </if>
-            <if test="dto.instanceId != null">
-                instance_id = #{dto.instanceId},
-            </if>
-            <if test="dto.promoter != null">
-                promoter = #{dto.promoter}
-            </if>
-        </set>
-        WHERE sequence_nbr = #{dto.sequenceNbr}
-    </update>
+
     <update id="updatePromoter">
         UPDATE amos_tzs_biz.tzs_jg_maintenance_contract set promoter = null
         where sequence_nbr = #{id}

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

@@ -386,7 +386,7 @@
             pp."PIPELINE_NUMBER" pipelineNumber,
             pp."NOMINAL_DIAMETER" nominalDiameter,
             pp."WALL_THICKNESS" wallThickness,
-            ROUND(pp."PIPE_LENGTH" / 1000.0, 4) pipeLength,
+            pp."PIPE_LENGTH" pipeLength,
             pp."PRESSURE" pressure,
             pp."TEMPERATURE" temperature,
             pp."MEDIUM" medium,
@@ -404,24 +404,18 @@
         WHERE
         ri."EQU_CATEGORY" = '8300'
         and ui."DATA_SOURCE" like 'jg%'
-        and NOT(ui."EQU_STATE" is not null )
-        and NOT(ri."USE_ORG_CODE" is not null )
-        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''" >
+        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
+        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
         </if>
-        <choose>
-            <when test="jsonObject.record != null and jsonObject.record != ''">
+        <if test="jsonObject.record != null and jsonObject.record != ''">
             and ui."RECORD" = #{jsonObject.record}
-            </when>
-            <otherwise>
-                <if test="records != null and records.size() > 0">
-                    and ui."RECORD" not in
-                    <foreach collection="records" item="record" separator="," open="(" close=")">
-                        #{record}
-                    </foreach>
         </if>
-            </otherwise>
-        </choose>
+        <if test="jsonObject.record == null">
+            and not exists(SELECT 1 FROM tzs_jg_use_registration v, tzs_jg_use_registration_eq ve WHERE
+            v.sequence_nbr = ve.equip_transfer_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
+            !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
+        </if>
         ORDER BY ui.REC_DATE DESC
     </select>
 
@@ -472,10 +466,9 @@
         WHERE
         ri."EQU_CATEGORY" = '2300'
         and ui."DATA_SOURCE" like 'jg%'
-        and NOT(ui."EQU_STATE" is not null )
-        and NOT(ri."USE_ORG_CODE" is not null )
         and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
-        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''">
+        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
+        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
         </if>
         <choose>

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

@@ -15,11 +15,20 @@
             <if test="dto.carNumber != null and dto.carNumber != ''">
                 and  tjvi.car_number like concat('%',#{dto.carNumber},'%')
             </if>
+            <if test="dto.regDate != null and dto.regDate != ''">
+                and tjvi.reg_date like concat('%',DATE_FORMAT(#{dto.regDate},'%Y-%m-%d'),'%')
+            </if>
+            <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
+                and tjvi.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
+            </if>
             <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
+            <if test="dto.useUnitCode != null and dto.useUnitCode != ''">
+                and tjvi.use_unit_credit_code = #{dto.useUnitCode}
+            </if>
             <if test="dto.dataType == 'supervision' ">
                 and  tjvi.receive_company_code = #{dto.useUnitCreditCode}
                 AND  tjvi.instance_id  <![CDATA[<>]]>  ''

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

@@ -63,6 +63,13 @@ public class CommonController extends BaseController {
     CodeUtil codeUtil;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/currentLoginInfo")
+    @ApiOperation(httpMethod = "GET", value = "当前登录人信息", notes = "当前登录人信息")
+    public ResponseModel<ReginParams> getChildren() {
+        return ResponseHelper.buildResponse(getSelectedOrgInfo());
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getChildren")
     @ApiOperation(httpMethod = "GET", value = "通过设备种类code获取设备类别", notes = "通过设备种类code获取设备类别")
     public ResponseModel<List<EquipmentCategory>> getChildren(@RequestParam(value = "code", required = false) String code,
@@ -568,4 +575,12 @@ public class CommonController extends BaseController {
         commonService.updateUnitTypeCache(getSelectedOrgInfo(), unitType, selectedRoleSeqs);
         return ResponseHelper.buildResponse("success");
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/historicalDataProcessingOfPressurePipeline")
+    @ApiOperation(httpMethod = "GET", value = "更新压力管道按照单位办理的使用登记历史单子中，管道长度从mm变成m", notes = "更新压力管道按照单位办理的使用登记历史单子中，管道长度从mm变成m")
+    public ResponseModel<String> historicalDataProcessingOfPressurePipeline(){
+        commonService.historicalDataProcessingOfPressurePipeline();
+        return ResponseHelper.buildResponse("success");
+    }
 }

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

@@ -97,12 +97,12 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	@DeleteMapping(value = "/delete")
 	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除单位变更", notes = "根据sequenceNbr删除单位变更")
 	public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
-		JgChangeRegistrationUnit byId = jgChangeRegistrationUnitServiceImpl.getById(sequenceNbr);
+		JgChangeRegistrationUnit changeRegistrationUnit = jgChangeRegistrationUnitServiceImpl.getById(sequenceNbr);
 		boolean bool = jgChangeRegistrationUnitServiceImpl.removeById(sequenceNbr);
 		if (bool){
-			commonService.deleteTaskModel(sequenceNbr+"");
+			commonService.deleteTaskModel(sequenceNbr+"",changeRegistrationUnit.getInstanceId());
 		}
-		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.removeById(sequenceNbr));
+		return ResponseHelper.buildResponse(bool);
 	}
 
 	/**

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

@@ -91,9 +91,11 @@ public class JgInstallationNoticeController extends BaseController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除安装告知", notes = "根据sequenceNbr删除安装告知")
     public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
-        // 删除暂存的待办
-        commonService.deleteTaskModel(String.valueOf(sequenceNbr));
-        return ResponseHelper.buildResponse(iJgInstallationNoticeService.removeById(sequenceNbr));
+        // 删除待办 + 中止流程
+        JgInstallationNotice jgInstallationNotice = iJgInstallationNoticeService.getBaseMapper().selectById(sequenceNbr);
+        commonService.deleteTaskModel(String.valueOf(sequenceNbr),jgInstallationNotice.getInstanceId());
+        jgInstallationNotice.setIsDelete(true);
+        return ResponseHelper.buildResponse(iJgInstallationNoticeService.updateById(jgInstallationNotice));
     }
 
     /**

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

@@ -95,7 +95,7 @@ public class JgMaintainNoticeController extends BaseController {
     @ApiOperation(value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
     public ResponseModel<Boolean> deleteForBatch(@RequestParam("sequenceNbrs") Long[] sequenceNbrs) {
         try {
-            return ResponseHelper.buildResponse(iJgMaintainNoticeService.deleteForBatch(sequenceNbrs));
+            return ResponseHelper.buildResponse(iJgMaintainNoticeService.deleteBySequenceNbr(sequenceNbrs));
         } catch (Exception e) {
             return CommonResponseUtil.failure(e.getMessage());
         }

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

@@ -13,6 +13,8 @@ import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintenanceContractServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +23,6 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import java.util.Map;
 
 /**
@@ -70,21 +71,6 @@ public class JgMaintenanceContractController extends BaseController {
     }
 
     /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @PostMapping(value = "/updateBySequenceNbr")
-    @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新维保合同备案", notes = "根据sequenceNbr更新维保合同备案")
-    public ResponseModel<Object> updateBySequenceNbr(@RequestBody JgMaintenanceContractDto dto,
-                                                     @RequestParam("sequenceNbr") Long sequenceNbr) {
-        dto.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateBySequenceNbr(dto));
-    }
-
-    /**
      * 根据sequenceNbr删除
      *
      * @param sequenceNbr 主键
@@ -93,11 +79,9 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
-    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        JgMaintenanceContractDto jgMaintenanceContractDto = new JgMaintenanceContractDto();
-        jgMaintenanceContractDto.setSequenceNbr(sequenceNbr);
-        jgMaintenanceContractDto.setIsDelete(true);
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateBySequenceNbr(jgMaintenanceContractDto));
+    public ResponseModel<Object> deleteBySequenceNbr(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        jgMaintenanceContractServiceImpl.deleteForBatch(new Long[]{sequenceNbr});
+        return ResponseHelper.buildResponse("success");
     }
 
     /**

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

@@ -101,8 +101,9 @@ public class JgTransferNoticeController extends BaseController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除移装造告知", notes = "根据sequenceNbr删除移装造告知")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
-        // 删除暂存的待办
-        commonServiceImpl.deleteTaskModel(String.valueOf(sequenceNbr));
+        // 删除待办 及 中止流程
+        JgTransferNotice jgTransferNotice = jgTransferNoticeService.getBaseMapper().selectById(sequenceNbr);
+        commonServiceImpl.deleteTaskModel(String.valueOf(sequenceNbr),jgTransferNotice.getInstanceId());
         return ResponseHelper.buildResponse(jgTransferNoticeService.removeById(sequenceNbr));
     }
 

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

@@ -247,14 +247,4 @@ public class JgUseRegistrationController extends BaseController {
         jgUseRegistrationServiceImpl.correctWrongData(applayNoList);
         return ResponseHelper.buildResponse("ok");
     }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-    @GetMapping(value = "/useDate/handle")
-    @ApiOperation(httpMethod = "GET", value = "使用登记单子中投用年月的数据处理", notes = "使用登记单子中投用年月的数据处理")
-    public ResponseModel<Object> yunWeiRegistrationWrongData() {
-        // 关联 任务 ： 26599 压力管道技术参数除起始位置、备注外均为必填，压力管道信息汇总表要求的字段在其余模块的都要求必填，压力管道信息汇总表也需要展示
-        // http://113.142.68.105:5080/zentao/task-view-26599.html
-        jgUseRegistrationServiceImpl.useDateHandler();
-        return ResponseHelper.buildResponse("ok");
-    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/listener/PlatformUserTopicMessage.java

@@ -48,7 +48,6 @@ public class PlatformUserTopicMessage extends EmqxListener {
                 .filter(jsonObject -> amosAgencyCode.equals(jsonObject.getString("agencyCode")))
                 .map(jsonObject -> jsonObject.getJSONObject("result"))
                 .filter(result -> StringUtils.isNotEmpty(result.getString("path")))
-                .map(result -> result.get("result"))
                 .flatMap(this::streamDataResult)
                 .forEach(this::processDataResult);
         log.info("平台推送消息同步完成");

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

@@ -210,4 +210,6 @@ public interface ICommonService {
      * @param unitType 单位类型
      */
     void updateUnitTypeCache(ReginParams reginParams, String unitType, String selectedRoleSeqs);
+
+    void historicalDataProcessingOfPressurePipeline();
 }

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/CommonServiceImpl.java

@@ -27,6 +27,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.enums.*;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
@@ -43,10 +44,12 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.PrivilegeFeginService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.TaskV2FeignService;
+import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipTechParamPipelineMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgSupervisionInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
@@ -90,6 +93,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.util.*;
@@ -232,6 +236,8 @@ public class CommonServiceImpl implements ICommonService {
     private TaskV2FeignService taskV2FeignService;
     @Autowired
     private Configuration configuration;
+    @Autowired
+    EquipTechParamPipelineMapper equipTechParamPipelineMapper;
 
     public static byte[] file2byte(File file) {
         try {
@@ -1285,15 +1291,41 @@ public class CommonServiceImpl implements ICommonService {
         return Boolean.FALSE;
     }
 
-    public void deleteTaskModel(String id) {
-        List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(id).getResult();
-        if (!result.isEmpty()) {
-            List<Long> idList = result.stream().map(TaskV2Model::getSequenceNbr).collect(Collectors.toList());
-            String ids = idList.stream().map(Object::toString).collect(Collectors.joining(","));
+    /**
+     * 删除代办及中止流程
+     * @param businessId 业务seq
+     * @param instanceId 业务流程id
+     */
+    public void deleteTaskModel(String businessId, String instanceId) {
+        // 删除暂存的代办
+        deleteTasksByRelationId(businessId);
+        // 删除流程中的代办 及 中止流程
+        if(!ObjectUtils.isEmpty(instanceId)){
+            deleteTasksAndStopProcess(instanceId, "发起人主动删除业务单");
+        }
+    }
+
+    /**
+     * 删除代办 -根据任务关联
+     * @param relationId
+     */
+    public void deleteTasksByRelationId(String relationId) {
+        List<TaskV2Model> tasks = taskV2FeignService.selectListByRelationId(relationId).getResult();
+        if (!tasks.isEmpty()) {
+            String ids = tasks.stream()
+                    .map(TaskV2Model::getSequenceNbr)
+                    .map(Object::toString)
+                    .collect(Collectors.joining(","));
             taskV2FeignService.delete(ids);
         }
     }
 
+    public void deleteTasksAndStopProcess(String instanceId, String reason) {
+        deleteTasksByRelationId(instanceId);
+        // 中止流程
+        cmWorkflowService.stopProcess(instanceId, reason);
+    }
+
     /**
      * 待办新增接口
      **/
@@ -1958,7 +1990,46 @@ public class CommonServiceImpl implements ICommonService {
     @Override
     public void updateUnitTypeCache(ReginParams reginParams, String unitType, String selectedRoleSeqs) {
         reginParams.getCompany().setCompanyType(unitType);
+        redisUtils.set(RedisKey.buildReginRoleKey(RequestContext.getExeUserId()), unitType);
         redisUtils.set(getSelectedRoleRedisKey(), selectedRoleSeqs, redisRegionTimeSecond);
         redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParams), redisRegionTimeSecond);
     }
+
+    @Override
+    public void historicalDataProcessingOfPressurePipeline() {
+
+        LambdaQueryWrapper<JgUseRegistration> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(JgUseRegistration::getManageType, "unit");
+        queryWrapper.eq(JgUseRegistration::getIsDelete, 0);
+        List<JgUseRegistration> jgUseRegistrations = jgUseRegistrationServiceImpl.getBaseMapper().selectList(queryWrapper);
+
+        // 对应的历史表
+        jgUseRegistrations.forEach(x->{
+            LambdaQueryWrapper<JgRegistrationHistory> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(JgRegistrationHistory::getCurrentDocumentId, x.getSequenceNbr());
+            JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(wrapper);
+            try{
+                if (jgRegistrationHistory.getChangeData().contains("8300")){
+                    JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
+                    if (!ValidationUtil.isEmpty(mapData.get("equipmentLists"))){
+                        List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) mapData.get("equipmentLists");
+                        // 遍历 equipmentLists，将 pipeLength 从毫米转换为米
+                        equipmentLists.forEach(equ -> {
+                            String record =(String) equ.get("record");
+                            EquipTechParamPipeline equipTechParamPipeline = equipTechParamPipelineMapper.queryTechParamInUse(record);
+                            BigDecimal pipeLengthInM = Optional.ofNullable(equipTechParamPipeline)
+                                    .map(EquipTechParamPipeline::getPipeLength)
+                                    .orElse(new BigDecimal("0"));
+                            equ.put("pipeLength", pipeLengthInM);
+                        });
+                    }
+                    jgRegistrationHistory.setChangeData(JSONObject.toJSONString(mapData));
+                    jgRegistrationHistoryService.getBaseMapper().updateById(jgRegistrationHistory);
+                }
+            }catch (Exception e){
+                log.error("更新压力管道出现错误：{}",e.getMessage());
+                e.printStackTrace();
+            }
+        });
+    }
 }
\ No newline at end of file

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -1624,7 +1624,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         useInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("USEINFO_SEQ")));
         if (companyTypeStr.contains(CompanyTypeEnum.USE.getCode()) || companyTypeStr.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
             useInfo.setUseUnitCreditCode(companyInfoMap.get("creditCode").toString());
-            useInfo.setUseUnitName(companyInfoMap.get("companyTypeName").toString());
+            useInfo.setUseUnitName(companyInfoMap.get("companyName").toString());
         }
 
         if (isCopy) {

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/JgChangeRegistrationNameServiceImpl.java

@@ -116,7 +116,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     @Autowired
     TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
 
-    private static String template = "来自企业（%s）的业务办理，【申请单号：%s】";
+    private static String template = "来自企业（%s）的业务办理";
 
     public static String  JG_COMAPNY_TYPE = "监管机构";
 
@@ -227,7 +227,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         // 提交创建待办逻辑
         if ("1".equals(submitType)) {
             //提交时先删除之前的暂存待办数据
-            commonService.deleteTaskModel(dto.getSequenceNbr() + "");
+            commonService.deleteTasksByRelationId(dto.getSequenceNbr() + "");
             // 创建待办
             TaskModelDto taskModelDto = new TaskModelDto();
             taskModelDto.setFlowCreateDate(dto.getApplyDate());
@@ -286,7 +286,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
      * @return 摘要
      */
     private String buildTaskContent(JgChangeRegistrationName dto) {
-        return String.format(template, dto.getUseUnitCreditCode(), dto.getApplyNo());
+        return String.format(template, dto.getUseUnitCreditCode());
     }
 
 
@@ -457,7 +457,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     }
 
     private void deleteTaskBatch(List<Long> ids) {
-        ids.forEach(id-> commonService.deleteTaskModel(id + ""));
+        ids.forEach(id-> {
+            JgChangeRegistrationName jgChangeRegistrationName = this.baseMapper.selectById(id);
+            commonService.deleteTaskModel(id + "",jgChangeRegistrationName.getInstanceId());
+        });
     }
 
     @Transactional(rollbackFor = Exception.class)

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/JgChangeRegistrationReformServiceImpl.java

@@ -263,7 +263,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 updateExecuteIds(instanceId, jgChangeRegistrationReform, "startWorkfow", processTaskDTO);
                 List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, processTaskDTO));
                 //启动之前删除暂存生成的待办
-                commonServiceImpl.deleteTaskModel(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()));
+                commonServiceImpl.deleteTasksByRelationId(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()));
                 //重新生成新的待办数据
                 commonServiceImpl.buildTaskModel(taskModelDtoList);
             }
@@ -507,7 +507,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReformEqMapper.delete(lambda1);
         jgRegistrationHistoryMapper.delete(new QueryWrapper<JgRegistrationHistory>().in("current_document_id", applyNos));
         //删除暂存的待办
-        ids.forEach(id -> commonServiceImpl.deleteTaskModel(String.valueOf(id)));
+        ids.forEach(id -> {
+            JgChangeRegistrationReform registrationReform = this.baseMapper.selectById(id);
+            commonServiceImpl.deleteTaskModel(String.valueOf(id),registrationReform.getInstanceId());
+        });
     }
 
     @Override
@@ -885,8 +888,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      * @deprecated 动态获取
      */
     public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
-        String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), Optional.ofNullable(jgChangeRegistrationReform.getSupervisoryCode()).orElse("无"), jgChangeRegistrationReform.getApplyNo());
+        String result = "来自%s【%s】的业务办理";
+        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), Optional.ofNullable(jgChangeRegistrationReform.getSupervisoryCode()).orElse("无"));
     }
 
     /**

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/JgChangeRegistrationTransferServiceImpl.java

@@ -351,7 +351,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
                 this.updateExecuteIds(instanceId, oldTransfer, "startWorkfow", workflowResult);
                 //删除旧的代办
-                commonService.deleteTaskModel(oldTransfer.getSequenceNbr().toString());
+                commonService.deleteTasksByRelationId(oldTransfer.getSequenceNbr().toString());
                 //生成代办
                 this.createToDoTask(Arrays.asList(workflowResult), oldTransfer, submitType);
             }
@@ -560,7 +560,10 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
     // 删除待办
     private void deleteTaskBatch(List<Long> ids) {
-        ids.forEach(id -> commonService.deleteTaskModel(id + ""));
+        ids.forEach(id -> {
+            JgChangeRegistrationTransfer jgChangeRegistrationTransfer = this.baseMapper.selectById(id);
+            commonService.deleteTaskModel(id + "",jgChangeRegistrationTransfer.getInstanceId());
+        });
     }
 
     /**
@@ -1229,8 +1232,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @deprecated 动态获取
      */
     public String getSummaryInfo(JgChangeRegistrationTransfer transfer) {
-        String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), Optional.ofNullable(transfer.getSupervisoryCode()).orElse("无"), Optional.ofNullable(transfer.getApplyNo()).orElse("无"));
+        String result = "来自%s【%s】的业务办理";
+        return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), Optional.ofNullable(transfer.getSupervisoryCode()).orElse("无"));
     }
 
     public String getNextUserOrgCode(String operate, JgChangeRegistrationTransfer contract) {

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/JgChangeRegistrationUnitServiceImpl.java

@@ -265,7 +265,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 notice.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
                 notice.setNextExecuteUserIds(nextUserIds);
                 JgChangeRegistrationUnitMapper.updateById(notice);
-                commonServiceImpl.deleteTaskModel(notice.getSequenceNbr()+"");
+                commonServiceImpl.deleteTasksByRelationId(notice.getSequenceNbr()+"");
                 createTaskModel(notice,taskname,"1", nextUserIds);
                 commonServiceImpl.saveExecuteFlowData2Redis(notice.getInstanceId(), buildInstanceRuntimeData(notice));
             }else {
@@ -570,7 +570,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 dto.setFlowCreateDate(new Date());
                 dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
                 dto.setFlowCode(obj.getNextTaskId());
-                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
+                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理");
                 dto.setTaskCode(obj.getApplyNo());
                 dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
                 dto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
@@ -592,7 +592,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 //行数据
                 dto.setModel(obj);
                 //摘要 按原有规则组装
-                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
+                dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理");
                 //申请单号
                 dto.setTaskCode(obj.getApplyNo());
                 //业务类型枚举code值
@@ -1082,7 +1082,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
 
     private String buildTaskContent(JgChangeRegistrationUnit obj) {
-        return "来自"+ EquipmentClassifityEnum.getNameByCode(obj.getEquList()) +"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】";
+        return "来自"+ EquipmentClassifityEnum.getNameByCode(obj.getEquList()) +"【"+obj.getSupervisoryCode()+"】的业务办理";
     }
 
 

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/JgEnableDisableServiceImpl.java

@@ -269,10 +269,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         dto.setModel(taskMessageDto);
         //摘要 按原有规则组装
         dto.setTaskContent(
-                String.format("来自%s【%s】的业务办理，【申请单号：%s】",
+                String.format("来自%s【%s】的业务办理",
                 ObjectUtils.isEmpty(jgEnableDisable.getEquList()) ? "" : jgEnableDisable.getEquList(),
-                ObjectUtils.isEmpty(jgEnableDisable.getSupervisoryCode()) ? "" : jgEnableDisable.getSupervisoryCode(),
-                jgEnableDisable.getApplyNo()));
+                ObjectUtils.isEmpty(jgEnableDisable.getSupervisoryCode()) ? "" : jgEnableDisable.getSupervisoryCode()));
         //申请单号
         dto.setTaskCode(jgEnableDisable.getApplyNo());
         //业务类型枚举code值
@@ -350,11 +349,11 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
             taskModelDto.setNextExecuteUser(item.getExecuteSequence());
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), item.getSupervisoryCode()));
             taskModelDtoList.add(taskModelDto);
             if (bool) {
                 // 删除暂存时生成的待办
-                commonService.deleteTaskModel(item.getSequenceNbr()+"");
+                commonService.deleteTasksByRelationId(item.getSequenceNbr()+"");
             }
         });
         if(bool){
@@ -707,8 +706,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         LambdaQueryWrapper<JgEnableDisableEq> lambda = new QueryWrapper<JgEnableDisableEq>().lambda();
         lambda.eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr);
         jgEnableDisableEqService.getBaseMapper().delete(lambda);
-        // 删除暂存时生成的待办
-        commonService.deleteTaskModel(sequenceNbr + "");
+        // 删除待办
+        JgEnableDisable jgEnableDisable = this.baseMapper.selectById(sequenceNbr);
+        commonService.deleteTaskModel(sequenceNbr + "",jgEnableDisable.getInstanceId());
     }
 
     public Map<String, Object> getDetail(Long sequenceNbr) {

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/JgEquipTransferServiceImpl.java

@@ -183,7 +183,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     private TaskModelDto buildTempTaskModelDto(JgEquipTransfer item) {
         return TaskModelDto.builder()
                 .model(item)
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), Objects.toString(item.getSupervisoryCode(), "")))
                 .taskCode(item.getApplyNo())
                 .taskType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode())
                 .relationId(item.getSequenceNbr() + "")
@@ -230,8 +230,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
                 .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
-                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), Objects.toString(item.getSupervisoryCode(), "")))
+                .taskDesc(String.format("来自%s【%s】的业务办理", item.getEquList(), Objects.toString(item.getSupervisoryCode(), "")))
                 .startUserId(item.getCreateUserId())
                 .startUser(item.getCreateUserName())
                 .startUserCompanyName(item.getCreateUserCompanyName())
@@ -265,8 +265,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .flowStatus(statusEnum.getCode())
                 .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(statusEnum.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))
-                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理", transfer.getEquList(), transfer.getSupervisoryCode()))
+                .taskDesc(String.format("来自%s【%s】的业务办理", transfer.getEquList(), transfer.getSupervisoryCode()))
                 .startUserCompanyName(reginParams.getCompany().getCompanyName())
                 .startUserId(taskV2Model.getStartUserId())
                 .startUser(taskV2Model.getStartUser())
@@ -325,7 +325,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
                 updateById(transfer);
                 //删除暂存
-                commonService.deleteTaskModel(transfer.getSequenceNbr() + "");
+                commonService.deleteTasksByRelationId(transfer.getSequenceNbr() + "");
 
                 // 如果为保存并提交，则创建代办
                 this.buildTask(Collections.singletonList(transfer), Collections.singletonList(workflowResultDto));
@@ -547,7 +547,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         String companyType = getStringFromMap(companyTypeMap, "companyType");
         if ("company".equals(companyLevel) && companyType != null) {
             if (companyType.contains(CompanyTypeEnum.USE.getCode()) || companyType.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
-                dto.setUseUnitCodeFilter(company.getCompanyCode());
+                dto.setUseUnitCodeFilter(company.getCompanyCode().contains("_") ? company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             }
             if (companyType.contains(CompanyTypeEnum.CONSTRUCTION.getCode())) {
                 dto.setInstallUnitCodeFilter(company.getCompanyCode());
@@ -746,7 +746,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         Collection<JgEquipTransfer> jgEquipTransfers = this.listByIds(Arrays.asList(ids));
         for (JgEquipTransfer notice : jgEquipTransfers) {
             notice.setIsDelete(true);
-            commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()));
+            commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()),notice.getInstanceId());
         }
         return this.updateBatchById(jgEquipTransfers);
     }

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/JgInstallationNoticeServiceImpl.java

@@ -160,6 +160,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     private ESEquipmentCategory esEquipmentCategory;
     @Autowired
     private JgResumeInfoServiceImpl jgResumeInfoService;
+    @Autowired
+    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
     /**
      * 根据sequenceNbr查询
@@ -179,7 +181,21 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         installationInfo.put("province", notice.getProvince() + "_" + notice.getProvinceName());
         installationInfo.put("city", notice.getCity() + "_" + notice.getCityName());
         installationInfo.put("county", notice.getCounty() + "_" + notice.getCountyName());
-        installationInfo.put("useUnitCreditCode", notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
+
+        TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(
+                new QueryWrapper<TzBaseEnterpriseInfo>()
+                        .eq("use_unit_code", notice.getUseUnitCreditCode())
+        );
+
+        if (useCodeResult != null) {
+            String result = notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName() +
+                    ("个人主体".equals(useCodeResult.getUnitType())
+                            ? "_" + notice.getUseUnitCreditCode().substring(notice.getUseUnitCreditCode().length() - 4)
+                            : "");
+            installationInfo.put("useUnitCreditCode", result);
+        }
+        //installationInfo.put("useUnitCreditCode", notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
+
         installationInfo.put("receiveOrgCreditCode", notice.getReceiveOrgCreditCode() + "_" + notice.getReceiveOrgName());
         installationInfo.put("installLeaderId", notice.getInstallLeaderId() + "_" + notice.getInstallLeaderName());
         if (!ValidationUtil.isEmpty(notice.getInspectUnitId()) && !ValidationUtil.isEmpty(notice.getInspectUnitName())) {
@@ -193,7 +209,17 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
 
         if (!ValidationUtil.isEmpty(notice.getPropertyUnitCreditCode()) && !ValidationUtil.isEmpty(notice.getPropertyUnitName())) {
-            installationInfo.put("propertyUnitName", notice.getPropertyUnitCreditCode() + "_" + notice.getPropertyUnitName());
+            //installationInfo.put("propertyUnitName", notice.getPropertyUnitCreditCode() + "_" + notice.getPropertyUnitName());
+            TzBaseEnterpriseInfo useCodeResult1 = tzBaseEnterpriseInfoMapper.selectOne(
+                    new QueryWrapper<TzBaseEnterpriseInfo>()
+                            .eq("use_unit_code", notice.getPropertyUnitCreditCode())
+            );
+            if (useCodeResult1 != null) {
+                installationInfo.put("propertyUnitName", notice.getPropertyUnitCreditCode() + "_" + notice.getPropertyUnitName() +
+                        ("个人主体".equals(useCodeResult1.getUnitType())
+                                ? "_" + notice.getPropertyUnitCreditCode().substring(notice.getPropertyUnitCreditCode().length() - 4)
+                                : ""));
+            }
         }
 
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
@@ -423,14 +449,17 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             return false;
         }
         Collection<JgInstallationNotice> jgInstallationNotices = this.listByIds(Arrays.asList(sequenceNbrs));
-        jgInstallationNotices.forEach(notice -> {
-            if (StringUtils.hasText(notice.getInspectUnitId())) {
-                throw new IllegalStateException("所选数据已存在流程，不能删除！");
-            }
-            notice.setIsDelete(true);
-        });
+        // jgInstallationNotices.forEach(notice -> {
+        //     if (StringUtils.hasText(notice.getInspectUnitId())) {
+        //         throw new IllegalStateException("所选数据已存在流程，不能删除！");
+        //     }
+        //     notice.setIsDelete(true);
+        // });
         // 删除暂存的待办
-        jgInstallationNotices.forEach(id -> commonService.deleteTaskModel(String.valueOf(id.getSequenceNbr())));
+        jgInstallationNotices.forEach(installationNotice -> {
+            installationNotice.setIsDelete(true);
+            commonService.deleteTaskModel(String.valueOf(installationNotice.getSequenceNbr()), installationNotice.getInstanceId());
+        });
         return this.updateBatchById(jgInstallationNotices);
     }
 
@@ -615,7 +644,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             BeanUtils.copyProperties(obj, taskMessageDto);
             dto.setModel(taskMessageDto);
             // 摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), StringUtils.isEmpty(obj.getFactoryNum()) ? "" : obj.getFactoryNum(), obj.getApplyNo()));
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理", obj.getEquList(), StringUtils.isEmpty(obj.getFactoryNum()) ? "" : obj.getFactoryNum()));
             // 申请单号
             dto.setTaskCode(obj.getApplyNo());
             // 业务类型枚举code值
@@ -648,14 +677,14 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), StringUtils.isEmpty(item.getFactoryNum()) ? "" : item.getFactoryNum(), item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), StringUtils.isEmpty(item.getFactoryNum()) ? "" : item.getFactoryNum()));
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
             taskModelDtoList.add(taskModelDto);
             if (isDeleteDraft) {
                 // 删除暂存时生成的待办
-                commonService.deleteTaskModel(item.getSequenceNbr() + "");
+                commonService.deleteTasksByRelationId(item.getSequenceNbr() + "");
             }
         });
         commonService.buildTaskModel(taskModelDtoList);
@@ -1293,12 +1322,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     }
 
     private void processElseDataByStatus(FlowStatusEnum oldNoticeStatus, JgInstallationNotice installationNotice) {
-        switch (oldNoticeStatus){
+        switch (oldNoticeStatus) {
             case TO_BE_SUBMITTED: // 待提交
                 // 1.写入历史表
                 this.saveHisDataBeforeUpdate(installationNotice);
                 // 2.删除暂存时生成的待办
-                commonService.deleteTaskModel(installationNotice.getSequenceNbr() + "");
+                commonService.deleteTasksByRelationId(installationNotice.getSequenceNbr() + "");
                 break;
             case TO_BE_FINISHED: // 已完成
                 // 1.删除之前完成时同步到一码通的施工信息
@@ -1348,12 +1377,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         // 强制更新字段为 NULL
         LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(IdxBizJgUseInfo::getRecord, jgRelationEquip.getEquId()); // 设置更新条件
-        updateWrapper.set(IdxBizJgUseInfo::getUseUnitCreditCode,null);
-        updateWrapper.set(IdxBizJgUseInfo::getUseUnitName,null);
+        updateWrapper.set(IdxBizJgUseInfo::getUseUnitCreditCode, null);
+        updateWrapper.set(IdxBizJgUseInfo::getUseUnitName, null);
         useInfoService.update(updateWrapper);
         // 2.2 es的USE_UNIT_CREDIT_CODE赋空
         Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(jgRelationEquip.getEquId());
-        if(optional.isPresent()){
+        if (optional.isPresent()) {
             ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
             esEquipmentCategoryDto.setUSE_UNIT_CREDIT_CODE(null);
             esEquipmentCategoryDto.setUSE_UNIT_NAME(null);

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/JgMaintainNoticeServiceImpl.java

@@ -337,27 +337,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         return this.queryForList("", false);
     }
 
-    /**
-     * 批量删除
-     *
-     * @param sequenceNbrs 主键
-     * @return 是否删除成功
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean deleteForBatch(Long[] sequenceNbrs) {
-        if (Objects.isNull(sequenceNbrs) || sequenceNbrs.length == 0) {
-            return false;
-        }
-        Collection<JgMaintainNotice> jgMaintainNotices = this.listByIds(Arrays.asList(sequenceNbrs));
-        jgMaintainNotices.forEach(notice -> {
-            if (StringUtils.hasText(notice.getInspectionUnitCreditCode())) {
-                throw new IllegalStateException("所选数据已存在流程，不能删除！");
-            }
-            notice.setIsDelete(true);
-        });
-        return this.updateBatchById(jgMaintainNotices);
-    }
 
     /**
      * 打印维修告知单
@@ -391,8 +370,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         LambdaQueryWrapper<JgMaintainNoticeEq> lambda = new QueryWrapper<JgMaintainNoticeEq>().lambda();
         lambda.eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr);
         jgMaintainNoticeEqMapper.delete(lambda);
-        // 删除暂存时生成的待办
-        commonService.deleteTaskModel(sequenceNbr + "");
+        // 删除待办 + 中止流程
+        JgMaintainNotice jgMaintainNotice = this.baseMapper.selectById(sequenceNbr);
+        commonService.deleteTaskModel(sequenceNbr + "",jgMaintainNotice.getInstanceId());
         return true;
     }
 
@@ -503,7 +483,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskMessageDto.setNextTaskId(obj.getNextTaskId());
             dto.setModel(taskMessageDto);
             //摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), StringUtils.isEmpty(obj.getSupervisoryCode()) ? "" : obj.getSupervisoryCode(), obj.getApplyNo()));
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理", obj.getEquList(), StringUtils.isEmpty(obj.getSupervisoryCode()) ? "" : obj.getSupervisoryCode()));
             //申请单号
             dto.setTaskCode(obj.getApplyNo());
             //业务类型枚举code值
@@ -544,11 +524,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskMessageDto.setNextTaskId(item.getNextTaskId());
             taskModelDto.setModel(taskMessageDto);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(),  StringUtils.isEmpty(item.getSupervisoryCode()) ? "" : item.getSupervisoryCode(), item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理", item.getEquList(),  StringUtils.isEmpty(item.getSupervisoryCode()) ? "" : item.getSupervisoryCode()));
             taskModelDtoList.add(taskModelDto);
             if (bool) {
                 // 删除暂存时生成的待办
-                commonService.deleteTaskModel(item.getSequenceNbr() + "");
+                commonService.deleteTasksByRelationId(item.getSequenceNbr() + "");
             }
         });
         commonService.buildTaskModel(taskModelDtoList);

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

@@ -168,17 +168,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         return vo;
     }
 
-
-    /**
-     * 根据sequenceNbr更新数据
-     *
-     * @param dto
-     * @return
-     */
-    public Boolean updateBySequenceNbr(JgMaintenanceContractDto dto) {
-        return maintenanceContractMapper.updateBySequenceNbr(dto);
-    }
-
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
     public void flowExecute(Long id, String instanceId, String operate, String comment, Boolean update, String nextTaskId) {
@@ -253,17 +242,11 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @GlobalTransactional(rollbackFor = Exception.class)
     public Boolean deleteForBatch(Long[] ids) {
         List<Long> list = Arrays.asList(ids);
-        list.forEach(x -> {
-            QueryWrapper<JgMaintenanceContract> wrapper = new QueryWrapper<>();
-            wrapper.eq("sequence_nbr", x);
-            JgMaintenanceContract jgMaintenanceContract = maintenanceContractMapper.selectOne(wrapper);
-            LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<JgMaintenanceContractEq>().eq(JgMaintenanceContractEq::getEquipTransferId, jgMaintenanceContract.getApplyNo()).eq(JgMaintenanceContractEq::getIsDelete, false);
-            List<Long> listSeq = jgMaintenanceContractEqService.list(queryWrapper).stream().map(JgMaintenanceContractEq::getSequenceNbr).collect(Collectors.toList());
-
-            commonService.deleteTaskModel(String.valueOf(jgMaintenanceContract.getSequenceNbr()));
-            maintenanceContractEqMapper.deleteForBatch(listSeq);
+        list.forEach(seq -> {
+            JgMaintenanceContract jgMaintenanceContract = this.baseMapper.selectById(seq);
+            commonService.deleteTaskModel(String.valueOf(jgMaintenanceContract.getSequenceNbr()),jgMaintenanceContract.getInstanceId());
+            this.baseMapper.deleteById(seq);
         });
-        maintenanceContractMapper.deleteForBatch(list);
         return true;
     }
 
@@ -482,7 +465,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 contract.setNextTaskId(nextTaskId);
                 contract.setStatus(String.valueOf(WorkFlowStatusEnum.MAIN_RECEIVE.getPass()));
                 contract.setNextExecuteUserIds(nextUserIds);
-                commonService.deleteTaskModel(contract.getSequenceNbr() + "");
+                commonService.deleteTasksByRelationId(contract.getSequenceNbr() + "");
                 // 创建待办
                 JgMaintenanceContract bean = new JgMaintenanceContract();
                 BeanUtil.copyProperties(contract, bean);
@@ -517,7 +500,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                     contract.setStatus(String.valueOf(WorkFlowStatusEnum.MAIN_RECEIVE.getPass()));
                     contract.setNextTaskId(nextTaskId);
                     contract.setNextExecuteUserIds(nextUserIds);
-                    commonService.deleteTaskModel(contract.getSequenceNbr() + "");
+                    commonService.deleteTasksByRelationId(contract.getSequenceNbr() + "");
                     executeOneStep(contract, taskName, nextUserIds, "0");
 
                     // redis流程实时数据更新
@@ -740,7 +723,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             }
         }
         supervisoryCode = StringUtils.isEmpty(supervisoryCode) ? "无" : supervisoryCode;
-        String format = String.format("来自%s【%s】等的业务办理，【申请单号：%s】等", equList, supervisoryCode, dto.getApplyNo());
+        String format = String.format("来自%s【%s】等的业务办理", equList, supervisoryCode);
         return format;
     }
 }
\ No newline at end of file

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/JgReformNoticeServiceImpl.java

@@ -210,7 +210,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
                 jgReformNoticeMapper.updateById(notice);
                 // 删除暂存
-                commonService.deleteTaskModel(notice.getSequenceNbr() + "");
+                commonService.deleteTasksByRelationId(notice.getSequenceNbr() + "");
                 // 如果为保存并提交，则创建代办
                 this.buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
             } else {
@@ -309,7 +309,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             //     throw new IllegalStateException("所选数据已存在流程，不能删除！");
             // }
             notice.setIsDelete(true);
-            commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()));
+            commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()),notice.getInstanceId());
         });
 
         return this.updateBatchById(JgReformNotices);
@@ -463,7 +463,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     private TaskModelDto buildTempTaskModelDto(JgReformNotice item) {
         return TaskModelDto.builder()
                 .model(item)
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), Objects.toString(item.getSupervisoryCode(), "")))
                 .taskCode(item.getApplyNo())
                 .taskType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode())
                 .relationId(item.getSequenceNbr() + "")
@@ -507,8 +507,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
                 .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
-                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), item.getSupervisoryCode()))
+                .taskDesc(String.format("来自%s【%s】的业务办理", item.getEquList(), item.getSupervisoryCode()))
                 .startUserId(item.getCreateUserId())
                 .startUser(item.getCreateUserName())
                 .startUserCompanyName(item.getCreateUserCompanyName())
@@ -848,8 +848,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 .flowStatus(statusEnum.getCode())
                 .flowCode(workflowResultDto.getNextTaskId())
                 .flowStatusLabel(statusEnum.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), ""), transfer.getApplyNo()))
-                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), ""), transfer.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), "")))
+                .taskDesc(String.format("来自%s【%s】的业务办理", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), "")))
                 .startUserCompanyName(transfer.getCreateUserCompanyName())
                 .startUserId(taskV2Model.getStartUserId())
                 .startUser(taskV2Model.getStartUser())

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/JgScrapCancelServiceImpl.java

@@ -70,7 +70,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PAGE_KEY = "jgScrapCancelAdd";
-    private static final String template = "来自%s【%s】【%s】的业务办理，【申请单号：%s】";
+    private static final String template = "来自%s【%s】【%s】的业务办理";
     @Autowired
     WorkFlowFeignService workFlowFeginService;
     @Autowired
@@ -275,7 +275,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             taskModelDto.setFlowCreateDate(scrapCancel.getCreateDate());
             taskModelDto.setTaskName(taskName);
             taskModelDto.setTaskCode(scrapCancel.getApplyNo());
-            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getSupervisoryCode(), scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
+            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getSupervisoryCode(), scrapCancel.getCancelType()));
             taskModelDto.setTaskDesc("");
             taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
             taskModelDto.setTaskTypeLabel(businessTypeJudgment(scrapCancel.getCancelType()).getName());
@@ -299,7 +299,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(scrapCancel, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
-            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getSupervisoryCode(), scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
+            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getSupervisoryCode(), scrapCancel.getCancelType()));
             taskModelDto.setTaskCode(scrapCancel.getApplyNo());
             taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
             taskModelDto.setNextExecuteUser(scrapCancel.getNextExecuteIds());
@@ -323,11 +323,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
      *
      * @return 摘要
      */
-    private String buildTaskContent(String equList, String supervisoryCode, String cancelType, String applyNo) {
+    private String buildTaskContent(String equList, String supervisoryCode, String cancelType) {
         //    来自电梯【X3100-123456】【移装注销】的业务办理【申请单号：ABCD0000001】
         String type = "1".equals(cancelType) ? "报废注销" : "移装注销";
         String equListName = EquipmentClassifityEnum.getNameByCode(equList);
-        return String.format(template, equListName, Objects.isNull(supervisoryCode) ? "无" : supervisoryCode, type, applyNo);
+        return String.format(template, equListName, Objects.isNull(supervisoryCode) ? "无" : supervisoryCode, type);
     }
 
     public void deleteBatch(List<Long> ids) {
@@ -337,7 +337,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 lambda.eq(JgScrapCancel::getSequenceNbr, id);
                 JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
                 // 删除代办消息
-                commonService.deleteTaskModel(String.valueOf(jgScrapCancel.getSequenceNbr()));
+                commonService.deleteTaskModel(String.valueOf(jgScrapCancel.getSequenceNbr()),jgScrapCancel.getInstanceId());
                 // 更新jgScrapCancel数据
                 jgScrapCancel.setIsDelete(true);
                 this.updateById(jgScrapCancel);
@@ -386,7 +386,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 // 创建待办
                 JgScrapCancel bean = new JgScrapCancel();
                 BeanUtil.copyProperties(jgScrapCancelDto, bean);
-                commonService.deleteTaskModel(String.valueOf(jgScrapCancelDto.getSequenceNbr()));
+                commonService.deleteTasksByRelationId(String.valueOf(jgScrapCancelDto.getSequenceNbr()));
                 createTaskModel(bean, taskName, "1", nextUserIds);
             } else {
                 // 已经在流程中，执行一步
@@ -456,7 +456,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         // 先更新之前的待办
         TaskV2Model taskV2Model = updateTaskModel(jgScrapCancelDto, operate);
         taskV2Model.setTaskDesc("");
-        taskV2Model.setTaskContent(this.buildTaskContent(jgScrapCancelDto.getEquList(), jgScrapCancelDto.getSupervisoryCode(), jgScrapCancelDto.getCancelType(), jgScrapCancelDto.getApplyNo()));
+        taskV2Model.setTaskContent(this.buildTaskContent(jgScrapCancelDto.getEquList(), jgScrapCancelDto.getSupervisoryCode(), jgScrapCancelDto.getCancelType()));
         taskV2Model.setTaskName(taskName);
         taskV2Model.setTaskCode(jgScrapCancelDto.getApplyNo());
         taskV2Model.setRelationId(jgScrapCancelDto.getInstanceId());

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/JgTransferNoticeServiceImpl.java

@@ -195,14 +195,17 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             return false;
         }
         Collection<JgTransferNotice> jgTransferNotices = this.listByIds(Arrays.asList(sequenceNbrs));
-        jgTransferNotices.forEach(notice -> {
-            if (StringUtils.hasText(notice.getInspectionUnitCreditCode())) {
-                throw new IllegalStateException("所选数据已存在流程，不能删除！");
-            }
-            notice.setIsDelete(true);
+        // jgTransferNotices.forEach(notice -> {
+        //     if (StringUtils.hasText(notice.getInspectionUnitCreditCode())) {
+        //         throw new IllegalStateException("所选数据已存在流程，不能删除！");
+        //     }
+        //     notice.setIsDelete(true);
+        // });
+        // 删除待办及中止流程
+        jgTransferNotices.forEach(jgTransferNotice -> {
+            jgTransferNotice.setIsDelete(true);
+            commonService.deleteTaskModel(String.valueOf(jgTransferNotice.getSequenceNbr()),jgTransferNotice.getInstanceId());
         });
-        // 删除暂存的待办
-        jgTransferNotices.forEach(id -> commonService.deleteTaskModel(String.valueOf(id.getSequenceNbr())));
         return this.updateBatchById(jgTransferNotices);
     }
 
@@ -439,7 +442,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             BeanUtils.copyProperties(obj, taskMessageDto);
             dto.setModel(taskMessageDto);
             //摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), StringUtils.isEmpty(obj.getSupervisoryCode()) ? "" : obj.getSupervisoryCode(), obj.getApplyNo()));
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理", obj.getEquList(), StringUtils.isEmpty(obj.getSupervisoryCode()) ? "" : obj.getSupervisoryCode()));
             //申请单号
             dto.setTaskCode(obj.getApplyNo());
             //业务类型枚举code值
@@ -524,14 +527,14 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
 
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), StringUtils.isEmpty(item.getSupervisoryCode()) ? "" : item.getSupervisoryCode(), item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理", item.getEquList(), StringUtils.isEmpty(item.getSupervisoryCode()) ? "" : item.getSupervisoryCode()));
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
             taskModelDtoList.add(taskModelDto);
             if (isDeleteDraft) {
                 // 删除暂存时生成的待办
-                commonService.deleteTaskModel(item.getSequenceNbr() + "");
+                commonService.deleteTasksByRelationId(item.getSequenceNbr() + "");
             }
         });
         commonService.buildTaskModel(taskModelDtoList);

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/JgVehicleInformationServiceImpl.java

@@ -283,6 +283,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         JgVehicleInformation vehicleInformation = new JgVehicleInformation();
         BeanUtils.copyProperties(vehicleInfoDto, vehicleInformation);
         vehicleInformation.setCreateUserId(reginParams.getUserModel().getUserId());
+        vehicleInformation.setRegDate(new Date());
         vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
         vehicleInformation.setGasNum(equipmentLists.size());
         vehicleInformation.setVolume(String.valueOf(equipmentLists.stream()
@@ -369,7 +370,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             BeanUtil.copyProperties(vehicleInformation, taskMessageDto);
             taskMessageDto.setEquipId(String.valueOf(map.get("equipId")));
             dto.setModel(taskMessageDto);
-            dto.setTaskContent("来自车用气瓶【" + vehicleInformation.getCarNumber() + "】的登记业务办理," + "【申请单号：" + vehicleInformation.getApplyNo() + "】");
+            dto.setTaskContent("来自车用气瓶【" + vehicleInformation.getCarNumber() + "】的登记业务办理");
             dto.setTaskCode(vehicleInformation.getApplyNo());
             dto.setTaskType(String.valueOf(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getCode()));
             dto.setRelationId(String.valueOf(vehicleInformation.getSequenceNbr()));
@@ -648,7 +649,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
         jgVehicleInformation.setNextTaskId(workflowResultDto.getNextTaskId());
         jgVehicleInformation.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-        commonService.deleteTaskModel(sequenceNbr + "");
+        commonService.deleteTasksByRelationId(sequenceNbr + "");
         if (isFirst) {
             jgVehicleInformation.setInstanceStatus(workflowResultDto.getExecutorRoleIds());
             jgVehicleInformation.setInstanceId(workflowResultDto.getInstanceId());
@@ -819,7 +820,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         BeanUtil.copyProperties(jgVehicleInformation, taskMessageDto);
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
-        dto.setTaskContent("来自车用气瓶【" + jgVehicleInformation.getCarNumber() + "】的登记业务办理," + "【申请单号：" + jgVehicleInformation.getApplyNo() + "】");
+        dto.setTaskContent("来自车用气瓶【" + jgVehicleInformation.getCarNumber() + "】的登记业务办理");
         dto.setFlowCode(jgVehicleInformation.getNextTaskId());
         list.add(dto);
         commonService.buildTaskModel(list);
@@ -836,7 +837,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         LambdaQueryWrapper<JgVehicleInformation> lambda = new QueryWrapper<JgVehicleInformation>().lambda();
         lambda.in(JgVehicleInformation::getSequenceNbr, ids);
         // 删除暂存的待办
-        ids.forEach(id -> commonService.deleteTaskModel(String.valueOf(id)));
+        ids.forEach(id -> {
+            JgVehicleInformation vehicleInformation = this.baseMapper.selectById(id);
+            commonService.deleteTaskModel(String.valueOf(id),vehicleInformation.getInstanceId());
+        });
         this.update(jgVehicleInformation, lambda);
     }
 
@@ -866,16 +870,16 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         // 更新使用信息
         useInfoMapper.update(useInfo, lambda);
 
-        InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
-        BeanUtil.copyProperties(map, inspectionDetectionInfo);
-        LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
-        inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("record"));
+        //InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
+        //BeanUtil.copyProperties(map, inspectionDetectionInfo);
+        //LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
+        //inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("record"));
         // 更新检验检测信息
-        inspectionDetectionInfo.setInspectReport(jgVehicleInformation.getInspectionCertificate());
-        inspectionDetectionInfo.setInspectOrgName(jgVehicleInformation.getInspectUnitName());
-        inspectionDetectionInfo.setInspectOrgCode(jgVehicleInformation.getInspectUnitCreditCode());
-        inspectionDetectionInfo.setNextInspectDate(jgVehicleInformation.getNextInspectionDate());
-        inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
+        //inspectionDetectionInfo.setInspectReport(jgVehicleInformation.getInspectionCertificate());
+        //inspectionDetectionInfo.setInspectOrgName(jgVehicleInformation.getInspectUnitName());
+        //inspectionDetectionInfo.setInspectOrgCode(jgVehicleInformation.getInspectUnitCreditCode());
+        //inspectionDetectionInfo.setNextInspectDate(jgVehicleInformation.getNextInspectionDate());
+        //inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
 
         // 更新设备监管部门
         IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = new IdxBizJgSupervisionInfo();
@@ -1222,7 +1226,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         switch (flowStatus) {
             case "使用单位待提交":
                 // 1.删除暂存时生成的待办
-                commonService.deleteTaskModel(vehicleInformation.getSequenceNbr() + "");
+                commonService.deleteTasksByRelationId(vehicleInformation.getSequenceNbr() + "");
                 break;
             case "已完成":
                 // 1.删除与设备的关系，设备可再次发起使用登记

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzBaseEnterpriseInfoController.java

@@ -34,10 +34,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 企业数据信息
@@ -201,6 +198,15 @@ public class TzBaseEnterpriseInfoController {
         return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.getInfoByUseCode(useCode));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/getInfoByUseCodeList", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据统一信用代码查询企业详情", notes = "根据统一信用代码查询企业详情")
+    public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> getInfoByUseCodeList(String useCode) {
+        Page<TzBaseEnterpriseInfoDto> page = new Page<>();
+        page.setRecords((Collections.singletonList(iTzBaseEnterpriseInfoService.getInfoByUseCode(useCode))));
+        return ResponseHelper.buildResponse(page);
+    }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyInfoUpdate", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "修改企业信息", notes = "修改企业信息")

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/EquipTechParamPipeline.java

@@ -89,7 +89,7 @@ public class EquipTechParamPipeline extends AbstractEquipBaseEntity {
     @TableField(value = "\"WALL_THICKNESS\"")
     private BigDecimal wallThickness;
     /**
-     * * 管道长度
+     * * 管道长度 （单位：m）
      */
 
     @TableField(value = "\"PIPE_LENGTH\"")

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgRegisterInfo.java

@@ -192,4 +192,12 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
     @TableField("\"LAST_USE_CERT_FILE_PATH\"")
     private String lastUseCertFilePath;
 
+    /**
+     * 是否球罐
+     *  1：是
+     *  0：不是
+     */
+    @TableField("\"WHETHER_SPHERICAL_TANK\"")
+    private String whetherSphericalTank;
+
 }