使用登记列表增加96333码

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

@@ -13,6 +13,7 @@
         date_format(reg_date,'%Y-%m-%d') as regDate,
         ur.use_unit_name as useUnitName,
         ur.status,
+        other.CODE96333 code96333,
         ur.receive_org_name as receiveOrgName,
         (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
         jri.PRODUCT_NAME as productName,
@@ -32,6 +33,7 @@
         LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
         LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
         LEFT JOIN idx_biz_jg_use_info  use   on re.equ_id = use.RECORD
+        LEFT JOIN idx_biz_jg_other_info  other   on re.equ_id = other.RECORD
 
         <where>
             and  ur.is_delete = 0

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

@@ -229,10 +229,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             }
 
             JgChangeRegistrationUnit notice = new JgChangeRegistrationUnit();
-            BeanUtils.copyProperties(noticeDto,notice);
-
+            JgChangeRegistrationUnit noticeOld = JgChangeRegistrationUnitMapper.selectById(noticeDto.getSequenceNbr());
+            BeanUtils.copyProperties(noticeOld,notice);
             boolean submit = submit(notice, op);
-
+            notice.setChangeCertificate(noticeDto.getChangeCertificate());
+            notice.setRemark(noticeDto.getRemark());
             if(submit) {
                 // 查询下节点任务
                 getNext(roleListSecond, notice.getInstanceId(),taskName);