Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml

@@ -118,7 +118,7 @@
         b.apply_content,
         b.open_id
         FROM nu_biz_suppliers_apply b
-        WHERE b.suppliers_id NOT IN (SELECT id FROM nu_biz_suppliers_info)
+        WHERE b.suppliers_id is null
         AND b.opt_type = '入驻'
         AND b.iz_history = 'N'
         ) sup

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java

@@ -304,4 +304,6 @@ public class NuEmployeesAdvisoryInfo implements Serializable {
     /**机构访问地址*/
     @TableField(exist = false)
     private String serverUrl;
+    @TableField(exist = false)
+    private String modifyStatus;
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml

@@ -47,7 +47,8 @@
         adinfo.*,
 <!--        (case when eo.apply_type = '2' then eo.modify_status else eo.status end) AS applyStatus,-->
         eo.status as applyStatus,
-        eo.audit_content AS auditContent
+        eo.audit_content AS auditContent,
+        eo.modify_status as modifyStatus
         FROM nu_biz_employees_advisory_info adinfo
         LEFT JOIN nu_biz_employees_org eo
         ON adinfo.open_id = eo.open_id

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java

@@ -11,6 +11,7 @@ import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo;
 import com.nu.modules.employees.mapper.EmployeesOrgMapper;
 import com.nu.modules.employees.service.IEmployeesOrgService;
 import com.nu.modules.employees.service.INuEmployeesAdvisoryInfoService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -121,6 +122,41 @@ public class EmployeesOrgServiceImpl extends ServiceImpl<EmployeesOrgMapper, Emp
         uw.eq("iz_history", "N");
         uw.eq("apply_type", "0");
         EmployeesOrg udto = new EmployeesOrg();
+        System.out.println("dto---------------------------"+dto);
+        NuEmployeesAdvisoryInfo advisoryInfo = employeesAdvisoryInfoService.getById(dto.getEmployeeId());
+        System.out.println("advisoryInfo---------------------------"+advisoryInfo);
+        if(advisoryInfo!=null){
+            udto.setTel(advisoryInfo.getTel());
+            udto.setName(advisoryInfo.getName());
+            udto.setSex(advisoryInfo.getSex());
+            udto.setNational(advisoryInfo.getNational());
+            udto.setBirthDate(advisoryInfo.getBirthDate());
+            udto.setIdCardAddress(advisoryInfo.getIdCardAddress());
+            udto.setIdCard(advisoryInfo.getIdCard());
+            udto.setIssuingAuthority(advisoryInfo.getIssuingAuthority());
+            udto.setStartTime(advisoryInfo.getStartTime());
+            udto.setEndTime(advisoryInfo.getEndTime());
+            udto.setCardZmPath(advisoryInfo.getCardZmPath());
+            udto.setCardFmPath(advisoryInfo.getCardFmPath());
+            udto.setMaritalStatus(advisoryInfo.getMaritalStatus());
+            udto.setHeight(advisoryInfo.getHeight());
+            udto.setWeight(advisoryInfo.getWeight());
+            udto.setHealthStatus(advisoryInfo.getHealthStatus());
+            udto.setPoliticalAppearance(advisoryInfo.getPoliticalAppearance());
+            udto.setContactName(advisoryInfo.getContactName());
+            udto.setContactTel(advisoryInfo.getContactTel());
+            udto.setContactRelationship(advisoryInfo.getContactRelationship());
+            udto.setHukouType(advisoryInfo.getHukouType());
+            udto.setBankZmPath(advisoryInfo.getBankZmPath());
+            udto.setBankFmPath(advisoryInfo.getBankFmPath());
+            udto.setOpeningBank(advisoryInfo.getOpeningBank());
+            udto.setBankCard(advisoryInfo.getBankCard());
+            udto.setHealthZmPath(advisoryInfo.getHealthZmPath());
+            udto.setHealthFmPath(advisoryInfo.getHealthFmPath());
+            udto.setQualificationPath(advisoryInfo.getQualificationPath());
+            udto.setNoCrimeCertificate(advisoryInfo.getNoCrimeCertificate());
+            udto.setCurrentAddress(advisoryInfo.getCurrentAddress());
+        }
         udto.setStatus(dto.getStatus());
         if ("2".equals(dto.getStatus())) {
             udto.setEntryTime(dto.getOpeTime());//审批通过的话将入职时间设置进去

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.nu.modules.employees.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -29,10 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -140,15 +138,8 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
     @Override
     public List<EmployeesAdvisoryInfoEntity> queryAuditInfo(String openId, String orgCode) {
         List<NuEmployeesAdvisoryInfo> list = baseMapper.queryEmployeeInfo(openId, orgCode);
-        List<EmployeesAdvisoryInfoEntity> result = Lists.newArrayList();
+        List<EmployeesAdvisoryInfoEntity> result = new ArrayList<>();
-        result = list.stream()
+        result = BeanUtil.copyToList(list, EmployeesAdvisoryInfoEntity.class);
-                .map(item -> {
-                    EmployeesAdvisoryInfoEntity entity = new EmployeesAdvisoryInfoEntity();
-                    BeanUtils.copyProperties(item, entity);
-
-                    return entity;
-                })
-                .collect(Collectors.toList());
         return result;
     }
 
@@ -236,8 +227,12 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
     @Override
     public EmployeesOrgApiEntity queryEmployeeInfoByOrgId(String id) {
         EmployeesOrg entity = employeesOrgService.getById(id);
+        System.out.println("entity-------------------------------"+entity);
         EmployeesOrgApiEntity entity2 = new EmployeesOrgApiEntity();
         BeanUtils.copyProperties(entity, entity2);
+        entity2.setApplyStatus(entity.getStatus());
+
+        System.out.println("entity2-------------------------------"+entity2);
         return entity2;
     }
 

nursing-unit-api/src/main/java/com/nu/modules/wechat/employees/api/EmployeesInfoApi.java

@@ -30,11 +30,11 @@ public class EmployeesInfoApi {
     @AutoLog(value = "员工咨询信息-新增或修改")
     @PostMapping("/saveApiEmployees")
     public Result<Object> saveApiEmployees(@RequestParam("ukey") String ukey, @RequestBody EmployeesAdvisoryInfoEntity EmployeesAdvisoryInfoEntity) {
-//        if (StringUtils.isNotBlank(EmployeesAdvisoryInfoEntity.getId())) {
+        if (StringUtils.isNotBlank(EmployeesAdvisoryInfoEntity.getId())) {
-//            if(!employeesAdvisioryInfoApi.validateChanged(EmployeesAdvisoryInfoEntity)){
+            if(!employeesAdvisioryInfoApi.validateChanged(EmployeesAdvisoryInfoEntity) && (StringUtils.equals("2", EmployeesAdvisoryInfoEntity.getApplyStatus()) || (StringUtils.equals("3", EmployeesAdvisoryInfoEntity.getApplyStatus())&& StringUtils.isNotBlank(EmployeesAdvisoryInfoEntity.getModifyStatus()) ))){
-//                return Result.ok("未做变更");
+                return Result.ok("未做变更");
-//            }
+            }
-//        }
+        }
         if(NuRedisUtils.existKey(ukey)){
             return Result.ok("重复提交");
         }

nursing-unit-common/src/main/java/com/nu/entity/EmployeesAdvisoryInfoEntity.java

@@ -141,4 +141,6 @@ public class EmployeesAdvisoryInfoEntity implements Serializable {
      * 现住址
      */
     private String currentAddress;
+
+    private String modifyStatus;
 }

nursing-unit-common/src/main/java/com/nu/entity/EmployeesOrgApiEntity.java

@@ -51,6 +51,7 @@ public class EmployeesOrgApiEntity implements Serializable {
     private String auditContent;
     /**申请类型 0被邀请 1主动申请 */
     private java.lang.String applyType;
+    private java.lang.String applyStatus;
 
 
     /**联系电话*/

nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml

@@ -371,11 +371,11 @@ justauth:
 aliyun:
   ocr:
 #    君
-#    accessKeyId: LTAI5tJxmaqyXSG1T8Q6PSE9
+    accessKeyId: LTAI5tJxmaqyXSG1T8Q6PSE9
-#    accessKeySecret: baBJyQOvph6dVugiSnx3tsiEuJeMy3
+    accessKeySecret: baBJyQOvph6dVugiSnx3tsiEuJeMy3
 #    滕
-    accessKeyId:     LTAI5tBREjXcTV54bhZu2eXx
+#    accessKeyId:     LTAI5tBREjXcTV54bhZu2eXx
-    accessKeySecret: ETmm0DE6kI6FM5B5wpUwxfNapv4Fr8
+#    accessKeySecret: ETmm0DE6kI6FM5B5wpUwxfNapv4Fr8
 #文件传输秘钥
 downloadkey: hP2K9Z!WLuj"M#8,