1.改造变更登记开发自测，冗余作废人员名称，详情时展示

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationReform.java

@@ -2,7 +2,10 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -277,4 +280,10 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField("cancel_user_id")
     private String cancelUserId;
+
+    /**
+     * 作废人员名称（冗余字段）
+     */
+    @TableField("cancel_user_name")
+    private String cancelUserName;
 }

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

@@ -9,6 +9,8 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl;
+import com.yeejoin.amos.feign.privilege.model.AgencyModel;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -202,7 +204,8 @@ public class JgChangeRegistrationReformController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "改造变更登记作废", notes = "改造变更登记作废")
     @PutMapping(value = "/cancel/application")
     public ResponseModel<JgChangeRegistrationReform> cancelApplication(@RequestBody JgChangeRegistrationReformDto registrationReformDto) {
-        JgChangeRegistrationReform result = jgChangeRegistrationReformServiceImpl.cancelApplication(registrationReformDto.getSequenceNbr(), registrationReformDto.getCancelReason());
+        AgencyUserModel user = getSelectedOrgInfo().getUserModel();
+        JgChangeRegistrationReform result = jgChangeRegistrationReformServiceImpl.cancelApplication(registrationReformDto.getSequenceNbr(), registrationReformDto.getCancelReason(), user.getRealName());
         return ResponseHelper.buildResponse(result);
     }
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -55,6 +57,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -655,6 +658,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 //        }
         jgChangeRegistrationReform.setReceiveCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode() + "_" + jgChangeRegistrationReform.getReceiveOrgName());
         detail.putAll(JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class));
+        if(jgChangeRegistrationReform.getCancelDate() != null){
+            detail.put("cancelDate", DateUtil.format(jgChangeRegistrationReform.getCancelDate(), DatePattern.NORM_DATETIME_PATTERN));
+        }
         if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
             detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
         }
@@ -1176,7 +1182,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
-    public JgChangeRegistrationReform cancelApplication(Long sequenceNbr, String cancelReason) {
+    public JgChangeRegistrationReform cancelApplication(Long sequenceNbr, String cancelReason, String realName) {
         // 1.更新为已作废
         JgChangeRegistrationReform jgChangeRegistrationReform = this.getById(sequenceNbr);
         String oldStatus = jgChangeRegistrationReform.getAuditStatus();
@@ -1185,6 +1191,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReform.setCancelReason(cancelReason);
         jgChangeRegistrationReform.setCancelDate(new Date());
         jgChangeRegistrationReform.setCancelUserId(RequestContext.getExeUserId());
+        jgChangeRegistrationReform.setCancelUserName(realName);
         jgChangeRegistrationReform.setNextExecuteUserIds(null);
         jgChangeRegistrationReform.setPromoter(null);
         this.updateById(jgChangeRegistrationReform);