Merge remote-tracking branch 'origin/develop_tzs_register_sxs' into develop_tzs_register_sxs

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

@@ -203,19 +203,21 @@ public class JgChangeRegistrationUnitController extends BaseController {
     }
 
     /**
-     * bug24304脏数据处理（单位变更登记一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去）
+     * bug24304脏数据处理（单位变更登记 注销 一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去）
      *
-     * @param applyNos 单位变更的申请编号
+     * @param applyNos 单位变更 / 注销 的申请编号
      * @return result
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/bug24304")
-    @ApiOperation(httpMethod = "GET", value = "bug24304脏数据处理（单位变更登记一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去）",
-            notes = "bug24304脏数据处理（单位变更登记一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去")
-    public ResponseModel<String> bug24304(@RequestParam(value = "applyNos")
+    @ApiOperation(httpMethod = "GET", value = "bug24304脏数据处理（单位变更登记 注销 一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去）",
+            notes = "bug24304脏数据处理（单位变更登记 注销 一勾选过多，部分变更设备失败，现在将变更失败的设备变更过去")
+    public ResponseModel<String> bug24304(@RequestParam(value = "businessType", defaultValue = "1")
+                                          @ApiParam(value = "业务类型,单位变更：1,   注销：2,   默认值为单位变更") String businessType,
+                                          @RequestParam(value = "applyNos")
                                           @ApiParam(value = "单位变更的申请编号,多个用逗号分隔") String applyNos) {
-        jgChangeRegistrationUnitServiceImpl.bug24304Handle(applyNos);
-        return ResponseHelper.buildResponse("申请单号：" + applyNos + "数据修改成功");
+        jgChangeRegistrationUnitServiceImpl.bug24304Handle(businessType, applyNos);
+        return ResponseHelper.buildResponse(businessType.equals("1") ? "单位变更" : "注销" + "业务，" + "申请单号：" + applyNos + "数据修改成功");
     }
 
 }

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

@@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -15,6 +14,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.*;
@@ -38,9 +38,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -1062,10 +1060,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
 
     private void saveRecord(JgScrapCancel jgScrapCancel, List<JgScrapCancelEq> jgScrapCancelEqList, String routePath, List<JgUseRegistrationManage> jgUseRegistrationManageList) {
-        String userName = jgScrapCancel.getCreateUserName();
-
-        FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(jgScrapCancel.getCreateUserId());
-        String content =jgScrapCancel.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" + CancelTypeEnum.getNameByType(jgScrapCancel.getCancelType()) + "】" +
+        String realName = Privilege.agencyUserClient.queryByUserId(jgScrapCancel.getCreateUserId()).getResult().getRealName();
+        String content = jgScrapCancel.getUseUnitName() + "的" + realName + "办理了【" + CancelTypeEnum.getNameByType(jgScrapCancel.getCancelType()) + "】" +
                 "单号【" + jgScrapCancel.getApplyNo() + "】，办理日期" + DateUtils.getDateNowShortStr();
         List<JgCertificateChangeRecord> certificateChangeRecords = new ArrayList<>();
         List<JgCertificateChangeRecordEq> changeRecordEqList = new ArrayList<>();