企业人员导出

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/tableDataExportVo/UserInfoVo.java

@@ -50,9 +50,6 @@ public class UserInfoVo {
     @ExcelProperty("住址")
     private String address;
 
-    @ExcelProperty(value = "执业注册")
-    private String practiceRegistration;
-
     @ExcelProperty("平台账户名")
     private String amosUserName;
 
@@ -81,6 +78,7 @@ public class UserInfoVo {
     protected Date transferOutTime;
 
     @ExcelProperty("检验检测-级别")
+    @DictCode2DictName(type = "RYJB_JC", typeHandler = "platformDictTypeHandler")
     private String permissionLevel;
 
     @ExcelProperty("检验检测-资质项目")

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

@@ -130,7 +130,7 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 			@RequestParam(value = "size") int size,
 			@RequestParam(value = "useUnitCreditCode", required = false) String useUnitCreditCode,
 			@RequestParam(value = "whetherVehicleCylinder") String whetherVehicleCylinder,
-			@RequestParam(value = "certificateStatus") String certificateStatus,
+			@RequestParam(value = "certificateStatus", required = false) String certificateStatus,
 			@RequestParam(value = "useRegistrationCode", required = false) String useRegistrationCode) {
 		if (ValidationUtil.isEmpty(useUnitCreditCode))
 			throw new BadRequest("请先选择原使用单位");

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/converter/TestProjectConverter.java

@@ -14,6 +14,7 @@ public class TestProjectConverter implements Converter<String> {
     private static final Map<String,String> CODE_MAP = new HashMap<>();
 
     static {
+        CODE_MAP.put("安全阀校验","F");
         CODE_MAP.put("射线胶片照相检测","RT");
         CODE_MAP.put("脉冲反射法超声检测","UT");
         CODE_MAP.put("磁粉检测","MT");

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -103,7 +103,7 @@
 
     <select id="getUserInfoWithExport" resultType="java.util.Map">
         SELECT
-        ur."name",ur."certificate_type",ur."certificate_num",ur."post",ur."phone",ur."birthday",ur."education",ur."speciality",ur."email",ur."address",ur."identification",ur."profile",ur."rec_date",ur."rec_user_id",ur."rec_user_name",ur."amos_user_id",ur."amos_user_name",ur."unit_name",ur."is_delete",ur."lock_status",ur."unit_code",ur."post_name",ur."equip_type",ur."appoint_doc",ur."inner_person_code",ur."other_accessories",ur."permission_level",ur."permission_item",ur."permission_data",ur."new_post",ur."job_title",ur."qr_code_state",ur."sub_post",ur."sub_post_name",ur."transfer_out_time",ur."practice_registration",ur."labor_contract",
+        ur."name",ur."certificate_type",ur."certificate_num",ur."post",ur."phone",ur."birthday",ur."education",ur."speciality",ur."email",ur."address",ur."identification",ur."profile",ur."rec_date",ur."rec_user_id",ur."rec_user_name",ur."amos_user_id",ur."amos_user_name",ur."unit_name",ur."is_delete",ur."lock_status",ur."unit_code",ur."post_name",ur."equip_type",ur."appoint_doc",ur."inner_person_code",ur."other_accessories",ur."new_post",ur."job_title",ur."qr_code_state",ur."sub_post",ur."sub_post_name",ur."transfer_out_time",ur."practice_registration",ur."labor_contract",
         up."permission_level",  up."permission_item",  up."permission_post",  up."cert_no",  up."expiry_date",  up."approved_organ",  up."issue_date",  up."cert_attachment",  up."cert_type",  up."job_item",  up."other_item",  up."remark",  up."rec_date",  up."rec_user_id",  up."rec_user_name",  up."item_code",
         CASE
         WHEN ur.gender = 1 THEN