Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/mapper/CylinderAreaDataMapper.java

@@ -44,4 +44,6 @@ public interface CylinderAreaDataMapper extends BaseMapper<CylinderAreaData> {
     List<CylinderInfoStatisticsDto> getCylinderStatisticsDataByCity(String orgCode);
 
     List<Map<String, Object>> getQiZhanStatisticsDataByCity(@Param(value = "orgCodes") List<String> orgCodes);
+
+    Long getOpertorStatisticsDataByCity(@Param(value = "orgCodes") List<String> orgCodes);
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderAreaDataMapper.xml

@@ -141,4 +141,22 @@
             a.orgCode
     </select>
 
+
+    <select id="getOpertorStatisticsDataByCity" resultType="Long">
+        SELECT
+            count(1)
+        FROM
+            tz_base_enterprise_info u
+                RIGHT JOIN tzs_user_info ui ON ui.unit_code = u.use_code
+        WHERE
+        u.data_sources = '陕西省内企业'
+        AND u.unit_type LIKE'%充装单位%'
+        AND ui.post like '%"6552"%'
+        <if test="orgCodes != null and orgCodes.size > 0">
+            AND
+            <foreach collection="orgCodes" open="(" item="orgCode" close=")" separator=" or ">
+                (u.org_code like concat(#{orgCode}, '%') )
+            </foreach>
+        </if>
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/controller/CylinderInfoController.java

@@ -1464,7 +1464,7 @@ public class CylinderInfoController extends BaseController {
 	public ResponseModel<IPage<CylinderFillingMessageModel>> getUploadCylinderLogs(PageParam pageParam, String regionCode )  {
 		IPage<CylinderFillingMessageModel> result = cylinderFillingMessageService.getUploadCylinderLogs(pageParam, regionCode);
 		return ResponseHelper.buildResponse(result);
-	};
+	}
 
 
 }

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

@@ -25,6 +25,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import joptsimple.internal.Strings;
+import org.apache.lucene.search.comparators.DoubleComparator;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -599,7 +600,7 @@ public class CylinderAreaDataServiceImpl extends BaseService<CylinderAreaDataDto
         Map<String, Object> result = new HashMap<>();
         result.put("cylindersCount", qiping);
         result.put("stationCount", unitNumber);
-        result.put("operatorCount", 0);
+        result.put("operatorCount", this.baseMapper.getOpertorStatisticsDataByCity(orgCodes));
         return result;
     }
 
@@ -735,9 +736,12 @@ public class CylinderAreaDataServiceImpl extends BaseService<CylinderAreaDataDto
         }
         Map<String, Object> result = new HashMap<>();
 
-        result.put("xdata", xdata);
-        List<String> ydata = new ArrayList<>();
+        List<Map<String, String>> data = new ArrayList<>();
+
+//        List<String> ydata = new ArrayList<>();
         for (int i = 0; i < xdata.size(); i++) {
+            Map<String, String> item = new HashMap<>();
+            item.put("name", xdata.get(i));
 
             // 计算xuke的加权值
             double xukeWeighted = Double.parseDouble(xuke.get(i)) * 0.10; // 10%
@@ -753,10 +757,31 @@ public class CylinderAreaDataServiceImpl extends BaseService<CylinderAreaDataDto
 
             // 计算总指数
             double totalIndex = xukeWeighted + jianyanchaoqiWeighted + jianyanhegeWeighted + czjcWeighted + czjchegeWeighted;
-
-            ydata.add(String.format("%.2f", totalIndex));
+            item.put("value",String.format("%.2f", totalIndex));
+            data.add(item);
+//            ydata.add(String.format("%.2f", totalIndex));
         }
-        result.put("ydata", ydata);
+
+        data = data.stream()
+                .filter(map -> map.containsKey("value")) // 确保每个Map都包含指定的键
+                .sorted(Comparator.comparingDouble(map -> {
+                    // 检查并解析值，如果失败则返回Double.MIN_VALUE（或根据需要处理）
+                    try {
+                        return Double.parseDouble(map.get("value"));
+                    } catch (NumberFormatException e) {
+                        // 处理无法解析为double的情况，这里返回Double.MIN_VALUE表示最小
+                        // 或者可以抛出自定义异常，记录日志等
+                        return Double.MIN_VALUE;
+                    }
+                }))
+                .collect(Collectors.toList());
+        List<String> name = data.stream().map(map -> map.get("name")).collect(Collectors.toList());
+        Collections.reverse(name);
+        result.put("xdata", name);
+        List<String> value = data.stream().map(map -> map.get("value")).collect(Collectors.toList());
+        Collections.reverse(value);
+        result.put("ydata", value);
+
         return result;
     }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java

@@ -46,7 +46,9 @@ public enum BusinessTypeEnum {
 
     JY_INSPECTION_APPLICATION_CHECK("117", "电梯检测"),
 
-    JG_VEHICLE_GAS_APPLICATION("118", "车用气瓶登记");
+    JG_VEHICLE_GAS_APPLICATION("118", "车用气瓶登记"),
+
+    JG_VEHICLE_GAS_CYLINDER_CHANGE("119", "车用气瓶变更登记");
     private final String code;
 
     private final String name;

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

@@ -2,6 +2,10 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 单位变更登记 Mapper 接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JgChangeVehicleRegistrationUnitMapper extends BaseMapper<JgChangeVehicleRegistrationUnit> {
 
+    List<Map<String, Object>> getEquList(@Param("records") List<String>records);
 }

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

@@ -2,4 +2,43 @@
 <!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.JgChangeVehicleRegistrationUnitMapper">
 
+    <select id="getEquList" resultType="java.util.Map">
+        SELECT
+        (SELECT "PRODUCE_UNIT_NAME" from idx_biz_jg_factory_info where "RECORD" = ri.RECORD) produceUnitName,
+        (SELECT "FACTORY_NUM" from idx_biz_jg_factory_info where "RECORD" = ri.RECORD) factoryNum,
+        to_char((SELECT "PRODUCE_DATE" from idx_biz_jg_factory_info where "RECORD" = ri.RECORD), 'YYYY-MM') produceDate,
+        ri."RECORD" record,
+        jui."USE_INNER_CODE" useInnerCode,
+        ri."EQU_CODE" equCode,
+        ri."EQU_LIST" equList,
+        (select name from tz_equipment_category where code = ri."EQU_LIST") equListName,
+        ri."EQU_CATEGORY" equCategory,
+        (select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
+        ri."EQU_DEFINE" equDefine,
+        (select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
+        ri."PRODUCT_NAME" productName,
+        ri."BRAND_NAME" brandName,
+        ri."EQU_TYPE" equType,
+        ri."EQU_CODE_TYPE" equCodeType,
+        ri."WHETHER_VEHICLE_CYLINDER" whetherVehicleCylinder,
+        pv."CHARGING_MEDIUM" chargingMedium,
+        pv."NOMINAL_WORKING_PRESSURE" nominalWorkingPressure,
+        pv."SINGLE_BOTTLE_VOLUME" singleBottleVolume,
+        to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') inspectDate,
+        to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate
+        FROM
+        idx_biz_jg_register_info ri
+        LEFT JOIN idx_biz_jg_use_info jui on ri.RECORD = jui.RECORD
+        LEFT JOIN idx_biz_jg_tech_params_vessel pv ON pv."RECORD" = ri.RECORD
+        WHERE ri."EQU_CATEGORY" = '2300' and jui."DATA_SOURCE" like 'jg%' and ri.whether_vehicle_cylinder = 1
+        and jui.record in
+        <foreach collection="records" item="record" open="(" close=")" separator=",">
+            #{record}
+        </foreach>
+
+    </select>
+
+
+
+
 </mapper>

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

@@ -119,7 +119,7 @@
                 AND tjurm.receive_company_code = #{dto.receiveCompanyCode}
             </if>
             -- 是否车用气瓶（whetherVehicleCylinder）= 1 ,过滤出车用气瓶使用登记证数据
-            <if test="dto.whetherVehicleCylinder != null and dto.whetherVehicleCylinder == '1' ">
+            <if test="dto.whetherVehicleCylinder != null and dto.whetherVehicleCylinder == 1 ">
                 AND tjurm.reg_type = '车用气瓶登记'
             </if>
             ORDER BY

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeVehicleRegistrationUnitServiceImpl;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,18 +38,7 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
     @Autowired
     JgChangeVehicleRegistrationUnitServiceImpl jgChangeVehicleRegistrationUnitServiceImpl;
 
-    /**
-     * 新增
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<JgChangeVehicleRegistrationUnitDto> save(@RequestBody JgChangeVehicleRegistrationUnitDto model) {
-	    model = jgChangeVehicleRegistrationUnitServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
+
 
 	/**
      * 根据sequenceNbr更新
@@ -101,6 +98,15 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 	    return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.queryForJgChangeVehicleRegistrationUnitPage(page));
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增、更新车用气瓶变更", notes = "新增、更新车用气瓶变更")
+	public ResponseModel<String> save(@RequestBody JSONObject model) {
+		ReginParams reginParams = getSelectedOrgInfo();
+		jgChangeVehicleRegistrationUnitServiceImpl.saveMessage(model, reginParams);
+		return ResponseHelper.buildResponse("");
+	}
+
 	/**
 	 * 列表全部数据查询
      *
@@ -112,4 +118,68 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 	public ResponseModel<List<JgChangeVehicleRegistrationUnitDto>> selectForList() {
 	    return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.queryForJgChangeVehicleRegistrationUnitList());
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping (value = "/getUseRegistrationCodeData")
+	@ApiOperation(httpMethod = "GET", value = "获取当前企业，某接收机构审批的使用登记证信息", notes = "获取当前企业，某接收机构审批的使用登记证信息")
+	public ResponseModel<Page<JgUseRegistrationManageDto>> getUseRegistrationCodeData(
+			@RequestParam(value = "current") int current,
+			@RequestParam(value = "size") int size,
+			@RequestParam(value = "useUnitCreditCode") String useUnitCreditCode,
+			@RequestParam(value = "whetherVehicleCylinder") String whetherVehicleCylinder,
+			@RequestParam(value = "certificateStatus") String certificateStatus
+	) {
+		JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto();
+		Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
+		page.setCurrent(current);
+		page.setSize(size);
+		if (!ValidationUtil.isEmpty(useUnitCreditCode)){
+			String[] codes = useUnitCreditCode.split("_");
+			if (!ValidationUtil.isEmpty(codes)){
+				dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
+			    dto.setUseUnitCreditCode(codes[0]);
+			}
+		}
+		if (!ValidationUtil.isEmpty(certificateStatus)){
+			dto.setCertificateStatus(certificateStatus);
+		}
+		if (!ValidationUtil.isEmpty(whetherVehicleCylinder)){
+			dto.setWhetherVehicleCylinder(whetherVehicleCylinder);
+		}
+		return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getUseRegistrationCodeData(page, dto));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getEquList")
+	@ApiOperation(httpMethod = "GET", value = "根据使用登记查询绑定气瓶(组件默认参数record)", notes = "根据使用登记查询绑定气瓶")
+	public ResponseModel<Map<String, Object>> getEquList(@RequestParam(value = "record") String record) {
+		return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getEquList(record));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/details")
+	@ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
+	public ResponseModel<Map<String, Object>> getDetails(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+		return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getDetails(sequenceNbr));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/withdraw")
+	@ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
+	public ResponseModel<Object> withdraw(@RequestBody JSONObject map) {
+		jgChangeVehicleRegistrationUnitServiceImpl.withdraw(String.valueOf(map.get("instanceId")), String.valueOf(map.get("nextTaskId")));
+		return ResponseHelper.buildResponse("ok");
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/flowExecute")
+	@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+	public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
+		jgChangeVehicleRegistrationUnitServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),
+				String.valueOf(map.get("instanceId")),
+				String.valueOf(map.get("operate")),
+				String.valueOf(map.get("comment")),
+				String.valueOf(map.get("nextTaskId")));
+		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/service/impl/CommonServiceImpl.java

@@ -29,8 +29,10 @@ 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.entity.JgUseRegistrationManage;
 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.mapper.JgUseRegistrationManageMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
@@ -210,6 +212,8 @@ public class CommonServiceImpl implements ICommonService {
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
     @Autowired
+    private JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
+    @Autowired
     IdxBizJgSupervisionInfoMapper idxBizJgSupervisionInfoMapper;
     @Autowired
     RedissonClient redissonClient;
@@ -240,6 +244,8 @@ public class CommonServiceImpl implements ICommonService {
     private Configuration configuration;
     @Autowired
     EquipTechParamPipelineMapper equipTechParamPipelineMapper;
+    @Autowired
+    private JgChangeVehicleRegistrationUnitServiceImpl jgChangeVehicleRegistrationUnitService;
 
     public static byte[] file2byte(File file) {
         try {
@@ -1179,7 +1185,13 @@ public class CommonServiceImpl implements ICommonService {
             provideMap.put(YZBG_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
             return jgChangeRegistrationTransferService.createTransfer(submitType, jsonObject, reginParams);
-        } else if (type.equals(ApplicationFormTypeEnum.DWBG.getBusinessCode())) {
+        }else if (type.equals(ApplicationFormTypeEnum.DWBG.getBusinessCode())  && !ObjectUtils.isEmpty(basicObj.get("equCategory")) && CylinderTypeEnum.SPECIAL_CYLINDER.getCode().equals(basicObj.get("equCategory").toString())) {
+            noticeObj.put("submit", submitType);
+            noticeObj.put("formType", "add");
+            noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
+            JSONObject jsonObject = new JSONObject(noticeObj);
+            return jgChangeVehicleRegistrationUnitService.saveMessage(jsonObject, reginParams);
+        }else if (type.equals(ApplicationFormTypeEnum.DWBG.getBusinessCode())) {
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(DWBG_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
@@ -2054,4 +2066,25 @@ public class CommonServiceImpl implements ICommonService {
         ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
         return responseModel.getResult();
     }
+
+
+    /**
+     * 获取最新的使用登记证书
+     *
+     * @param useUnitCreditCode 使用单位统一信用代码
+     * @param equCategoryCode   设备类别编码
+     * @return
+     */
+    public JgUseRegistrationManage getLatestJgUseRegistrationManage(String useUnitCreditCode, String equCategoryCode) {
+        LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper();
+        lambdaQueryWrapper.eq(JgUseRegistrationManage::getUseUnitCreditCode, useUnitCreditCode);
+        lambdaQueryWrapper.eq(JgUseRegistrationManage::getEquCategory, equCategoryCode);
+        lambdaQueryWrapper.eq(JgUseRegistrationManage::getRegType, CertificateStatusEnum.YIDENGJI.getName());
+        lambdaQueryWrapper.orderByDesc(JgUseRegistrationManage::getAuditPassDate);
+        List<JgUseRegistrationManage> jgUseRegistrationManages = jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
+        if (!CollectionUtils.isEmpty(jgUseRegistrationManages) && jgUseRegistrationManages.size() > 0) {
+            return jgUseRegistrationManages.get(0);
+        }
+        return null;
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -286,5 +286,23 @@
     "pageType": "look",
     "name": "车用气瓶登记",
     "url": "/mixuap?appId=1742358052905971713&id=1770004751216308226&roleIds={roleIds}&userId={userId}&pageType=look"
+  },
+  {
+  "type": "119",
+  "pageType": "draft",
+  "name": "车用气瓶变更登记",
+  "url": "/mixuap?appId=1742358052905971713&id=1811028265452728322&roleIds={roleIds}&userId={userId}&pageType=edit"
+},
+  {
+    "type": "119",
+    "pageType": "edit",
+    "name": "车用气瓶变更登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1811028630713692161&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "119",
+    "pageType": "look",
+    "name": "车用气瓶变更登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1811028630713692161&roleIds={roleIds}&userId={userId}&pageType=look"
   }
 ]
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/TaskModelServiceImpl.java

@@ -235,7 +235,7 @@ public class TaskModelServiceImpl {
      * @param obj 自己的实体：taskType为BusinessTypeEnum code；nextExecuteUser
      */
     public void rollbackTask(String id, JSONObject obj) {
-
+        this.removeNoUsedKey(obj);
         List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
         List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
         TaskV2Model model = list.get(0);
@@ -287,6 +287,25 @@ public class TaskModelServiceImpl {
         }
     }
 
+    public void removeNoUsedKey(JSONObject obj) {
+        obj.remove("applicationRemark");
+        obj.remove("planData");
+        obj.remove("inspectionChargePerson");
+        obj.remove("inspectionChargePersonName");
+        obj.remove("inspectionChargePhone");
+        obj.remove("recUserId");
+        obj.remove("recDate");
+        obj.remove("applicationDate");
+        obj.remove("acceptDate");
+        obj.remove("superviseOrgName");
+        obj.remove("dockingUnitCode");
+        obj.remove("address");
+        obj.remove("detectionRegion");
+        obj.remove("expiryDate");
+        obj.remove("applyTime");
+        obj.remove("expiryDate");
+    }
+
     private static String toQueryParams2(JSONObject jsonObject) {
         StringBuilder sb = new StringBuilder();
         Set<String> keys = jsonObject.keySet();

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

@@ -1106,7 +1106,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         params.put("taskStatusLabel", model.getStatusName());
         params.put("flowStatus", model.getStatus());
         params.put("flowStatusLabel", model.getStatusName());
-        params.put("model", model);
+        JSONObject jsonModel = (JSONObject)JSONObject.toJSON(model);
+        taskModelService.removeNoUsedKey(jsonModel);
+        params.put("model", jsonModel);
         return taskModelService.updateTaskModel(params);
     }