企业人员导出

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

@@ -883,7 +883,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
     @Override
     public void userInfoExport(String uuid, String ids, Map<String, Object> map) {
         List<String> userInfoSeqs = getUserInfoSeqs(false, ids, map);
-        List<Map<String, String>> enterInfoWithExport = tzsUserInfoMapper.getUserInfoWithExport(userInfoSeqs);
+        List<Map<String, String>> enterInfoWithExport = tzsUserInfoMapper.getUserInfoWithExport("false",userInfoSeqs);
         List<UserInfoVo> exportData = JSON.parseArray(JSON.toJSONString(enterInfoWithExport), UserInfoVo.class);
         DictUtil.dictCode2DictName(exportData);
         MultipartFile templateExcelFile = ExcelUtil.createTemplateExcelFile("人员信息列表数据", "人员信息列表列表", exportData, UserInfoVo.class, null, false);
@@ -899,7 +899,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
     @Override
     public void userInfoExportWithAdmin(String uuid, String ids, Map<String, Object> map) {
         List<String> userInfoSeqs = getUserInfoSeqs(true, ids, map);
-        List<Map<String, String>> enterInfoWithExport = tzsUserInfoMapper.getUserInfoWithExport(userInfoSeqs);
+        List<Map<String, String>> enterInfoWithExport = tzsUserInfoMapper.getUserInfoWithExport("true", userInfoSeqs);
         List<UserInfoVo> exportData = JSON.parseArray(JSON.toJSONString(enterInfoWithExport), UserInfoVo.class);
         DictUtil.dictCode2DictName(exportData);
         MultipartFile templateExcelFile = ExcelUtil.createTemplateExcelFile("人员信息列表数据", "人员信息列表列表", exportData, UserInfoVo.class, null, false);

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

@@ -14,20 +14,31 @@ public class QualificationProjectConverter implements Converter<String> {
     private static final Map<String,String> CODE_MAP = new HashMap<>();
 
     static {
+        CODE_MAP.put("检验员-大型游乐设施检验","YLY");
+        CODE_MAP.put("检验员-场（厂）内专用机动车辆检验","CCY");
+        CODE_MAP.put("检验员-承压类设备型式试验","CXY");
+        CODE_MAP.put("检验员-机电类设备型式试验","JXY");
+        CODE_MAP.put("检验员-锅炉检验","GLY");
+        CODE_MAP.put("检验员-锅炉能效测试","GNY");
+        CODE_MAP.put("检验员-锅炉水（介）质检验-蒸汽锅炉（额定压力小于或者等于2.5MPa）、热水锅炉和有机热载体锅炉的定期检验和监督检验","GSY");
+        CODE_MAP.put("检验员-锅炉水（介）质检验-热载体锅炉价值的定期检验和化学清洗过程的监督检验","GRY");
+        CODE_MAP.put("检验员-压力容器检验","RQY");
+        CODE_MAP.put("检验员-气瓶检验","QPY");
+        CODE_MAP.put("检验员-压力管道检验","GDY");
+        CODE_MAP.put("检验员-电梯检验","DTY");
+        CODE_MAP.put("检验员-起重机械检验","QZY");
+        CODE_MAP.put("检验员-客运索道检验","SDY");
+        CODE_MAP.put("检验师-大型游乐设施检验","YLS");
+        CODE_MAP.put("检验师-锅炉水（介）质检验","SZS");
+        CODE_MAP.put("检验师-压力容器检验","RQS");
+        CODE_MAP.put("检验师-压力管道检验","GDS");
+        CODE_MAP.put("检验师-电梯检验","DTS");
+        CODE_MAP.put("检验师-起重机械检验","QZS");
+        CODE_MAP.put("检验师-客运索道检验","SDS");
+        CODE_MAP.put("检验师-锅炉检验","GLS");
+        CODE_MAP.put("检验师-场（厂）内专用机动车辆检验","CCS");
         CODE_MAP.put("机电类设备检验","JDG");
         CODE_MAP.put("承压类设备检验","CYG");
-        CODE_MAP.put("大型游乐设施检验","YLY");
-        CODE_MAP.put("型式试验","CXY");
-        CODE_MAP.put("锅炉检验","GLY");
-        CODE_MAP.put("锅炉能效测试","GNY");
-        CODE_MAP.put("锅炉水（介）质检验","GSY");
-        CODE_MAP.put("压力容器检验","RQY");
-        CODE_MAP.put("气瓶检验","QPY");
-        CODE_MAP.put("压力管道检验","GDY");
-        CODE_MAP.put("电梯检验","DTY");
-        CODE_MAP.put("起重机械检验","QZY");
-        CODE_MAP.put("客运索道检验","SDY");
-        CODE_MAP.put("场（厂）内专用机动车辆检验","CCY");
     }
 
     @Override

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

@@ -14,9 +14,9 @@ public class TestLevelConverter implements Converter<String> {
     private static final Map<String,String> CODE_MAP = new HashMap<>();
 
     static {
-        CODE_MAP.put("Ⅰ级(初级)","RYJB_JC");
-        CODE_MAP.put("Ⅱ级(中级)","RYJB_JC");
-        CODE_MAP.put("Ⅲ级(高级)","RYJB_JC");
+        CODE_MAP.put("Ⅰ级初级","I");
+        CODE_MAP.put("Ⅱ级中级","II");
+        CODE_MAP.put("Ⅲ级高级","III");
     }
 
     @Override

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,18 +14,25 @@ public class TestProjectConverter implements Converter<String> {
     private static final Map<String,String> CODE_MAP = new HashMap<>();
 
     static {
-        CODE_MAP.put("声发射检测","ZZXM_III");
-        CODE_MAP.put("涡流检测","ZZXM_III");
-        CODE_MAP.put("渗透检测","ZZXM_III");
-        CODE_MAP.put("磁粉检测","ZZXM_III");
-        CODE_MAP.put("脉冲反射法超声检测","ZZXM_III");
-        CODE_MAP.put("射线数字成像检测","ZZXM_II");
-        CODE_MAP.put("脉冲反射法超声检测（自动）","ZZXM_II");
-        CODE_MAP.put("衍射时差法超声检测","ZZXM_II");
-        CODE_MAP.put("相控阵超声检测","ZZXM_II");
-        CODE_MAP.put("涡流检测(自动)","ZZXM_II");
-        CODE_MAP.put("漏磁检测(自动)","ZZXM_II");
-        CODE_MAP.put("射线胶片照相检测","ZZXM_II");
+        CODE_MAP.put("射线胶片照相检测","RT");
+        CODE_MAP.put("脉冲反射法超声检测","UT");
+        CODE_MAP.put("磁粉检测","MT");
+        CODE_MAP.put("渗透检测","PT");
+        CODE_MAP.put("射线数字成像检测","RT(D)");
+        CODE_MAP.put("脉冲反射法超声检测（自动）","UT(AUTO)");
+        CODE_MAP.put("衍射时差法超声检测","TOFD");
+        CODE_MAP.put("相控阵超声检测","PA");
+        CODE_MAP.put("涡流检测(自动)","ECT(AUTO)");
+        CODE_MAP.put("漏磁检测(自动)","MFL(AUTO)");
+//        CODE_MAP.put("射线胶片照相检测","RT");
+//        CODE_MAP.put("脉冲反射法超声检测","UT");
+//        CODE_MAP.put("磁粉检测","MT");
+        CODE_MAP.put("声发射检测","AE");
+        CODE_MAP.put("涡流检测","ECT");
+//        CODE_MAP.put("渗透检测","PT");
+//        CODE_MAP.put("磁粉检测","MT");
+//        CODE_MAP.put("脉冲反射法超声检测","UT");
+//        CODE_MAP.put("射线胶片照相检测","RT");
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/CompanyUserImportDto.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.tcm.api.converter.*;
 import lombok.Data;
 
@@ -175,6 +176,8 @@ public class CompanyUserImportDto {
 
         @ExcelIgnore
         private JSONArray jobItem;
+        @ExcelIgnore
+        private JSONObject itemCode;
 
         @ExcelProperty(value = "金属焊接操作-项目代号")
         private String JSHJCZItemCode;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -1694,6 +1694,14 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                     JSONArray objects = new JSONArray();
                     objects.add(OperatorQua.getJobItemStr());
                     OperatorQua.setJobItem(objects);
+                    JSONObject itemCode = new JSONObject();
+                    if (!ValidationUtil.isEmpty(OperatorQua.getFJSHJCZItemCode())) {
+                        itemCode.fluentPut("FJSHJCZItemCode",OperatorQua.getFJSHJCZItemCode());
+                    }
+                    if (!ValidationUtil.isEmpty(OperatorQua.getJSHJCZItemCode())) {
+                        itemCode.fluentPut("JSHJCZItemCode",OperatorQua.getJSHJCZItemCode());
+                    }
+                    OperatorQua.setItemCode(itemCode);
                     permissionData6552.add(OperatorQua);
                     data.setPermissionData6552(permissionData6552);
                 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserPermissionServiceImpl.java

@@ -114,15 +114,18 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
                 // 作业项目中含有【金属焊接操作】，则【金属焊接操作-项目代号】必填
                 // 作业项目中含有【非金属焊接操作】，则【非金属焊接操作-项目代号】必填
                 // 作业项目中含有【其他】，则【其他作业项目是必填的】必填
-                String jobItem = String.valueOf(itempermissionData6552.get("jobItem"));
+                JSONArray jobItem = JSON.parseArray(JSON.toJSONString(itempermissionData6552.get("jobItem")));
                 String otherItem = String.valueOf(itempermissionData6552.get("otherItem"));
                 JSONObject itemCode = JSON.parseObject(String.valueOf(itempermissionData6552.get("itemCode")));
-                if (jobItem.contains("金属焊接操作") && !ObjectUtils.isEmpty(itemCode) && ObjectUtils.isEmpty(itemCode.get("JSHJCZItemCode"))) {
-                    throw new BadRequest("作业项目中含有金属焊接操作，需填写金属焊接操作-项目代号");
-                }
-                if (jobItem.contains("非金属焊接操作") && !ObjectUtils.isEmpty(itemCode) && ObjectUtils.isEmpty(itemCode.get("FJSHJCZItemCode"))) {
-                    throw new BadRequest("作业项目中含有非金属焊接操作，需填写非金属焊接操作-项目代号");
-                }
+                jobItem.forEach(job ->{
+                    String jobStr = String.valueOf(job);
+                    if (jobStr.equals("金属焊接操作") && !ObjectUtils.isEmpty(itemCode) && ObjectUtils.isEmpty(itemCode.get("JSHJCZItemCode"))) {
+                        throw new BadRequest("作业项目中含有金属焊接操作，需填写金属焊接操作-项目代号");
+                    }
+                    if (jobStr.equals("非金属焊接操作") && !ObjectUtils.isEmpty(itemCode) && ObjectUtils.isEmpty(itemCode.get("FJSHJCZItemCode"))) {
+                        throw new BadRequest("作业项目中含有非金属焊接操作，需填写非金属焊接操作-项目代号");
+                    }
+                });
                 if (jobItem.contains("其他") && ObjectUtils.isEmpty(otherItem)) {
                     throw new BadRequest("作业项目中含有其他，需填写其他作业项目");
                 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzsUserInfoMapper.java

@@ -20,5 +20,5 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
 
     List<TzsUserInfoDto> selectUserPermission(@Param("operator") String operator, @Param("posts") List<String> posts);
 
-    List<Map<String, String>> getUserInfoWithExport(@Param("ids") List<String> userInfoSeqs);
+    List<Map<String, String>> getUserInfoWithExport(@Param("isAdmin") String isAdmin, @Param("ids") List<String> userInfoSeqs);
 }

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

@@ -116,12 +116,18 @@
         FROM "amos_tzs_biz"."tzs_user_info" ur
         LEFT JOIN "amos_tzs_biz"."tzs_user_permission" up ON ur."sequence_nbr" = up."user_seq"
         <where>
-            <if test='ids != null'>
+            <if test='ids != null and isAdmin == "true"'>
                 and (COALESCE (up.sequence_nbr, ur.sequence_nbr)) in
                 <foreach collection="ids" item="id" open="(" close=")" separator=",">
                     #{id}
                 </foreach>
             </if>
+            <if test='ids != null  and isAdmin == "false"'>
+                and ur.sequence_nbr in
+                <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         </where>
     </select>
 </mapper>
\ No newline at end of file