fix:(jg):气瓶单位变更功能开发

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

@@ -239,6 +239,17 @@ public class JgChangeRegistrationUnit extends BaseEntity {
     @TableField(exist = false)
     private String equDefine;
     /**
+     * 设备品种代码
+     */
+    @TableField(exist = false)
+    private String equDefineCode;
+
+    /**
+     * 设备类别
+     */
+    @TableField(exist = false)
+    private String equCategory;
+    /**
      *工作流下一节点任务id
      */
     @TableField(value = "next_task_id")

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

@@ -1303,11 +1303,18 @@
                 </otherwise>
             </choose>
         </if>
-        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
-            and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
-            -- 限制 没有做过使用登记的
-            and (ri."USE_ORG_CODE" is null or ri."USE_ORG_CODE" = '')
-        </if>
+        <choose>
+            <!--气瓶单位变更使用登记证号 + 单位信用代码联合查询 -->
+            <when test="jsonObject.useRegistCode != null and jsonObject.useRegistCode != ''">
+                and ri."USE_ORG_CODE" = #{jsonObject.useRegistCode}
+                and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
+            </when>
+            <!-- 否则根据社会信用代码查询（仅限未登记的） -->
+            <when test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
+                and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
+                and (ri."USE_ORG_CODE" is null or ri."USE_ORG_CODE" = '')
+            </when>
+        </choose>
         <choose>
             <when test="jsonObject.record != null and jsonObject.record != ''">
                 and ui."RECORD" =  #{jsonObject.record}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/useRegister/UseRegisterUpdateService.java

@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -105,8 +106,8 @@ public class UseRegisterUpdateService {
      */
     public void updateUseRegistrationInfo(String bizId, List<FieldChangeMeta> allChangeColumns) {
         Map<String, Object> useRegistrationMap = jgUseRegistrationService.getJgUseRegistrationMapper().getUseRegistrationDetail(bizId);
-        JgUseRegistration jgUseRegistration = jgUseRegistrationService.getById(useRegistrationMap.get("UseRegistratSequenceNbr").toString());
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getDteailByRecord(bizId, useRegistrationMap.get("UseRegistratSequenceNbr").toString());
+        JgUseRegistration jgUseRegistration = jgUseRegistrationService.getById(MapUtils.getString(useRegistrationMap, "UseRegistratSequenceNbr"));
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getDteailByRecord(bizId, MapUtils.getString(useRegistrationMap, "UseRegistratSequenceNbr"));
         allChangeColumns.forEach(meta -> {
             if (!ValidationUtil.isEmpty(jgUseRegistration)) {
                 // 更新接收机构