1.设备注销报废初稿代码提交

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+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;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -51,6 +55,8 @@ public class JgScrapCancelDto extends BaseDto {
     private String createUserId;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "流程状态")

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

@@ -34,7 +34,8 @@
             DATE_FORMAT(tjsc.audit_pass_date,'%Y-%m-%d') as auditPassDate,
             tjsc.use_unit_name,
             tjsc.use_unit_code,
-            tjsc.use_registration_code
+            tjsc.use_registration_code,
+            tjsc.equ_list_code
         from tzs_jg_scrap_cancel tjsc
         <where>
             tjsc.is_delete = 0
@@ -58,7 +59,7 @@
             </if>
 
             <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
-                AND tjsc."USE_ORG_CODE" like concat('%',#{dto.useRegistrationCode},'%')
+                AND tjsc."use_registration_code" like concat('%',#{dto.useRegistrationCode},'%')
             </if>
             <if test="roleIds != null and dto.type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>

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

@@ -136,7 +136,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         Page<JgScrapCancelDto> listPage = this.baseMapper.getListPage(page, sortMap, dto, roleIds, orgCode, currentUserId);
         listPage.getRecords().forEach(item -> {
             if (item.getCancelType() != null) {
-                item.setCancelType(CancelTypeEnum.getNameByType(item.getCancelType()));
+                item.setCancelTypeDesc(CancelTypeEnum.getNameByType(item.getCancelType()));
             }
             if (item.getEquListCode() != null) {
                 item.setEquListName(EquipmentClassifityEnum.getNameByCode(item.getEquListCode()));
@@ -264,7 +264,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         String equListName = EquipmentClassifityEnum.getNameByCode(jsonObject.get("equListCode").toString());
         save2HisData(jsonObject, jgScrapCancel.getSequenceNbr().toString());
         JgScrapCancelDto dto = new JgScrapCancelDto();
-        BeanUtil.copyProperties(jgScrapCancel, new JgScrapCancelDto());
+        BeanUtil.copyProperties(jgScrapCancel, dto);
         dto.setEquListName(equListName);
         return dto;
     }

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

@@ -236,37 +236,37 @@
   {
     "type": "113-1",
     "pageType": "draft",
-    "name": "移装注销",
+    "name": "注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "113-1",
     "pageType": "look",
-    "name": "移装注销",
+    "name": "注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "113-1",
     "pageType": "edit",
-    "name": "移装注销",
+    "name": "注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "113-2",
     "pageType": "draft",
-    "name": "报废注销",
+    "name": "报废",
     "url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "113-2",
     "pageType": "look",
-    "name": "报废注销",
+    "name": "报废",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "113-2",
     "pageType": "edit",
-    "name": "报废注销",
+    "name": "报废",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {