Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.4

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -7,6 +7,7 @@ import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotificationToRole;
 import com.xunmei.common.core.utils.DateUtils;
@@ -543,7 +544,6 @@ public class SysUserController extends BaseController {
         AtomicInteger xh = new AtomicInteger();
         xh.getAndIncrement();
         securityUserExports.forEach(e -> {
-
             e.setXh(String.valueOf(xh.getAndIncrement()));
         });
         if (securityUserExports.size() > 10000) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.constant.UserConstants;
 import com.xunmei.common.core.domain.OrgTreeReq;
 import com.xunmei.common.core.domain.OrgTreeResp;
@@ -28,6 +29,7 @@ import com.xunmei.system.domain.vo.SysUserVO;
 import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.mapper.*;
 import com.xunmei.system.service.ISysConfigService;
+import com.xunmei.system.service.ISysDictDataService;
 import com.xunmei.system.service.ISysOrgService;
 import com.xunmei.system.service.ISysUserService;
 import com.xunmei.system.util.SecurityUserExport;
@@ -80,6 +82,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     protected Validator validator;
     @Autowired
     private SysOrgMapper sysOrgMapper;
+    @Autowired
+    private ISysDictDataService iSysDictDataService;
 
     /**
      * 根据条件分页查询用户列表
@@ -695,8 +699,42 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public List<SecurityUserExport> downSecurityUser() {
-        SysOrg sysOrg = sysOrgMapper.selectById(SecurityUtils.getLoginUser().getOrgId());
-        return userMapper.selectSecurityUser();
+        List<SecurityUserExport> securityUserExports = userMapper.selectSecurityUser();
+        securityUserExports.forEach(s -> {
+            s.setCity("福建");
+            SysOrg sysOrg = sysOrgMapper.selectById(s.getOrgId());
+            SysOrg sysOrg1 = new SysOrg();
+            if (sysOrg.getShortName().endsWith("地区行社")) {
+                s.setCity(sysOrg.getShortName().substring(0, 2));
+            } else if (sysOrg.getType() < 3 || sysOrg.getType() == 9) {
+                sysOrg1 = sysOrgMapper.selectSysOrgById(sysOrg.getParentId());
+            } else {
+                sysOrg1 = sysOrgMapper.selectSysOrgById(sysOrgMapper.selectSysOrgById(sysOrg.getParentId()).getParentId());
+                if (-1 == sysOrg1.getShortName().indexOf("地区行社")) {
+                    sysOrg1 = sysOrgMapper.selectSysOrgById(sysOrgMapper.selectSysOrgById(sysOrgMapper.selectSysOrgById(sysOrg.getParentId()).getParentId()).getParentId());
+                }
+            }
+            if (null != sysOrg1) {
+                s.setCity(sysOrg1.getShortName().indexOf("地区行社") == -1 ? sysOrg1.getShortName().substring(0, 2) : sysOrg1.getShortName().split("地区行社")[0]);
+            }
+            //部门名称
+            String departmentName = iSysDictDataService.selectDictLabel("department_name", s.getDepartmentName());
+            s.setDepartmentName(departmentName);
+            //现任职务
+            String nowDuties = iSysDictDataService.selectDictLabel("current_position", s.getNowDuties());
+            s.setNowDuties(nowDuties);
+            //用工形式
+            String workType = iSysDictDataService.selectDictLabel("sys_work_type", s.getWorkType());
+            s.setWorkType(workType);
+            //最高学历
+            String sysHighestEducation = iSysDictDataService.selectDictLabel("sys_highest_education", s.getHighestEducation());
+            s.setHighestEducation(sysHighestEducation);
+            //取得方式
+            String sysEducationType = iSysDictDataService.selectDictLabel("sys_education_type", s.getEducationType());
+            s.setEducationType(sysEducationType);
+            String sysDuties = iSysDictDataService.selectDictLabel("sys_duties", s.getResponsibilitiesLeaderDuties());s.setResponsibilitiesLeaderDuties(sysDuties);
+        });
+        return securityUserExports;
     }
 
     @Override

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/CertificateWorkConverter.java

@@ -0,0 +1,37 @@
+package com.xunmei.system.util;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/11/24
+ */
+public class CertificateWorkConverter implements Converter<String> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return null;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }
+
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(String s, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+      if (s.equals("1")){
+          return new CellData("通过");
+      }else {
+          return new CellData("未通过");
+      }
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityUserExport.java

@@ -7,7 +7,6 @@ import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
@@ -43,7 +42,7 @@ public class SecurityUserExport {
     private String departmentName;
     @ExcelProperty(value = "现任职务", index = 8)
     private String nowDuties;
-    @ExcelProperty(value = "是否专职（专职是指专职做安全保卫部门相应岗位工作，不再兼任其他岗位或部门工作）", index = 9)
+    @ExcelProperty(value = "是否专职（专职是指专职做安全保卫部门相应岗位工作，不再兼任其他岗位或部门工作）", index = 9,converter = UserManagerConverter.class)
     private String isFullTime;
     @ExcelProperty(value = "用工形式", index = 10)
     private String workType;
@@ -57,9 +56,9 @@ public class SecurityUserExport {
     private String educationType;
     @ExcelProperty(value = "初级以上（含初级）相关专业技术职业资格", index = 15)
     private String professionalQualifications;
-    @ExcelProperty(value = "持证上岗考试通过情况", index = 16)
+    @ExcelProperty(value = "持证上岗考试通过情况", index = 16,converter = CertificateWorkConverter.class)
     private String certificateWork;
-    @ExcelProperty(value = "持证上岗考试通过情况", index = 17)
+    @ExcelProperty(value = "持证上岗考试未通过原因（按照下拉选项填列）", index = 17)
     private String certificateFailReason;
     @ExcelProperty(value = "分管领导姓名", index = 18)
     private String responsibilitiesLeaderName;

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysNfcBindMapper.xml

@@ -123,7 +123,7 @@
         order by a.org_id,a.area_id,code
     </select>
     <select id="selectSysNfcBindByCode" resultType="com.xunmei.system.domain.SysNfcBind">
-        SELECT * FROM sys_nfc_bind WHERE code=#{code}
+        SELECT * FROM sys_nfc_bind WHERE del_flag=0 AND code=#{code}
     </select>
 
     <insert id="insertSysNfcBind" parameterType="com.xunmei.system.domain.SysNfcBind">

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -711,7 +711,7 @@
             c.id AS orgId,
             c.short_name AS orgName,
             b.`name` AS name,
-            b.gender AS gender,
+            IFNULL( b.gender, 2 ) AS gender,
             b.card AS card,
             TIMESTAMPDIFF( YEAR, a.born_time, NOW() ) AS age,
             a.dept_id AS departmentName,