Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgVehicleInformationMapper.java

@@ -7,6 +7,8 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
 import java.util.List;
 import java.util.Map;
 
@@ -34,4 +36,7 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
     List<Map<String, Object>> queryForUnitVesselEquipment(@Param("sequenceNbr") Long sequenceNbr, @Param("records")List<String> records);
 
     Long countVesselCylinderIsUsedNumber(@Param("vehicleId") Long vehicleId, @Param("records") List<String> records);
+
+    @Select("select name from tz_equipment_category where code=#{code}")
+    String getEquCategoryNameByCode(String code);
 }

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

@@ -13,7 +13,9 @@
             tjurm.reg_type                                                      AS regType,
             DATE_FORMAT(tjurm.reg_date,'%Y-%m-%d')                              AS regDate,
             tjurm.equ_list                                                      AS equList,
+            tjurm.equ_list_code                                                 AS equListCode,
             tjurm.equ_define                                                    AS equDefine,
+            tjurm.equ_define_code                                               AS equDefineCode,
             tjurm.remark                                                        AS remark,
             tjurm.rec_user_id                                                   AS recUserId,
             DATE_FORMAT(tjurm.rec_date,'%Y-%m-%d')                              AS recDate,
@@ -25,6 +27,7 @@
             tjurm.receive_company_code                                          AS receiveCompanyCode,
             tjurm.certificate_no                                                AS certificateNo,
             tjurm.equ_category                                                  AS equCategory,
+            tjurm.equ_category_code                                             AS equCategoryCode,
             tjurm.equ_use_address                                               AS equUseAddress,
             tjurm.use_unit_address                                              AS useUnitAddress
     </sql>

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/JgUseRegistrationServiceImpl.java

@@ -1180,7 +1180,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     private String buildRecordContent(JgUseRegistration obj) {
-        //张三办理了【单位变更】 ，单号【DWBG202407050001】，原恒星电梯单位变更为新恒星电梯有限公司，办理日期2024-07-05
+        //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
         return obj.getRecUserName() + "办理了【"+BusinessTypeEnum.JG_USAGE_REGISTRATION.getName()+"】，" +
                 "单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());