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

nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfoApiEntity.java

@@ -379,4 +379,5 @@ public class OrgAllInfoApiEntity implements Serializable {
      */
     private String platformBuildComplete;
 
+    private String headPath;
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java

@@ -120,6 +120,7 @@ public class NuBizSuppliersApply implements Serializable {
     private String optType;
     private String suppliersId;
     private String izHistory;
+    private String headPath;
 
     @TableField(exist = false)
     private String status;

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java

@@ -129,6 +129,7 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
         addDto.setOpeningBank(suppliersApplyEntity.getOpeningBank());
         addDto.setOpeningBankNo(suppliersApplyEntity.getOpeningBankNo());
         addDto.setImgPath(suppliersApplyEntity.getImgPath());
+        addDto.setHeadPath(suppliersApplyEntity.getHeadPath());
         baseMapper.insert(addDto);
 
         return null;

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

@@ -171,5 +171,6 @@ public class EmployeesOrg implements Serializable {
     private String noCrimeCertificate;
     /**现住址*/
     private String currentAddress;
+    private String headPath;
 
 }

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

@@ -301,6 +301,7 @@ public class NuEmployeesAdvisoryInfo implements Serializable {
     private java.util.Date lastLoginTime;//最近上一次登录时间
 
     private String izInit;//是否需要员工初始化 0否 1是
+    private String headPath;//
     /**机构访问地址*/
     @TableField(exist = false)
     private String serverUrl;

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

@@ -87,6 +87,7 @@ public class EmployeesOrgServiceImpl extends ServiceImpl<EmployeesOrgMapper, Emp
         employeesOrg.setQualificationPath(dto.getQualification());
         employeesOrg.setNoCrimeCertificate(dto.getNoCrimeCertificate());
         employeesOrg.setCurrentAddress(dto.getCurrentAddress());
+        employeesOrg.setHeadPath(dto.getHeadPath());
 
         baseMapper.insert(employeesOrg);
         return employeesOrg.getId();

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

@@ -132,6 +132,7 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
         mqdto.setPoliticalAppearance(dto.getPoliticalAppearance());
         mqdto.setApplyType(emAdd.getApplyType());
         mqdto.setModifyStatus(emAdd.getModifyStatus());
+        mqdto.setHeadPath(dto.getHeadPath());
         rabbitMQUtil.sendToExchange("hldy.employee", dto.getOrgCode() + ".employee.infoUpdate.audit", mqdto);
         return 1;
     }
@@ -289,7 +290,8 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
                         Objects.equals(dbRecord.getHealthFmPath(), inputRecord.getHealthFmPath()) &&
                         Objects.equals(dbRecord.getQualificationPath(), inputRecord.getQualificationPath()) &&
                         Objects.equals(dbRecord.getNoCrimeCertificate(), inputRecord.getNoCrimeCertificate()) &&
-                        Objects.equals(dbRecord.getCurrentAddress(), inputRecord.getCurrentAddress())
+                        Objects.equals(dbRecord.getCurrentAddress(), inputRecord.getCurrentAddress()) &&
+                        Objects.equals(dbRecord.getHeadPath(), inputRecord.getHeadPath())
         );
     }
 

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java

@@ -214,6 +214,7 @@ public class OrgApplyInfo implements Serializable {
     @Excel(name = "操作类型", width = 15)
     @ApiModelProperty(value = "操作类型")
     private java.lang.String optTypeName;
+    private java.lang.String headPath;
 
 
     @TableField(exist = false)

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml

@@ -262,7 +262,8 @@
         sd.address,
         sd.net_url,
         sd.account_no,
-        sd.password_text
+        sd.password_text,
+        info.head_path
         FROM nu_org_apply_info AS info
         left join sys_depart sd on info.pk_id = sd.id
         <where>
@@ -379,7 +380,8 @@
         sd.province,
         sd.city,
         sd.district,
-        sd.address
+        sd.address,
+        info.head_path
         FROM nu_org_apply_info AS info
         left join sys_depart sd on info.pk_id = sd.id
         <where>

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java

@@ -125,6 +125,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
         orgApplyInfo.setStatus("1");//入驻申请
         orgApplyInfo.setOptType("rz");
         orgApplyInfo.setOptTypeName("入驻");
+        orgApplyInfo.setHeadPath(orgApplyInfoApiEntity.getHeadPath());
         baseMapper.insert(orgApplyInfo);
         orgApplyInfoApiEntity.setId(orgApplyInfo.getId());
         return orgApplyInfoApiEntity;
@@ -181,6 +182,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
         orgApplyInfo.setStatus("1");//变更申请
         orgApplyInfo.setOptType("bg");
         orgApplyInfo.setOptTypeName("变更");
+        orgApplyInfo.setHeadPath(orgApplyInfoApiEntity.getHeadPath());
         baseMapper.insert(orgApplyInfo);
         orgApplyInfoApiEntity.setId(orgApplyInfo.getId());
         return orgApplyInfoApiEntity;
@@ -629,6 +631,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
             sysDepartEntity.setOrgProvince(orgApplyInfo.getOrgProvince());//机构省份
             sysDepartEntity.setOrgCity(orgApplyInfo.getOrgCity());//机构城市
             sysDepartEntity.setOrgDistrict(orgApplyInfo.getOrgDistrict());//机构区域
+            sysDepartEntity.setHeadPath(orgApplyInfo.getHeadPath());
             sysBaseAPI.updateById(sysDepartEntity);
 
             //发送小程序、微信通知
@@ -759,7 +762,8 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
                         Objects.equals(newData.getOrgBuildingArea(), beforeData.getOrgBuildingArea()) &&
                         Objects.equals(newData.getOrgProvince(), beforeData.getOrgProvince()) &&
                         Objects.equals(newData.getOrgCity(), beforeData.getOrgCity()) &&
-                        Objects.equals(newData.getOrgDistrict(), beforeData.getOrgDistrict())
+                        Objects.equals(newData.getOrgDistrict(), beforeData.getOrgDistrict())&&
+                        Objects.equals(newData.getHeadPath(), beforeData.getHeadPath())
         );
     }
 
@@ -803,7 +807,8 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
                         Objects.equals(newData.getOrgBuildingArea(), usingData.getOrgBuildingArea()) &&
                         Objects.equals(newData.getOrgProvince(), usingData.getOrgProvince()) &&
                         Objects.equals(newData.getOrgCity(), usingData.getOrgCity()) &&
-                        Objects.equals(newData.getOrgDistrict(), usingData.getOrgDistrict())
+                        Objects.equals(newData.getOrgDistrict(), usingData.getOrgDistrict())&&
+                        Objects.equals(newData.getHeadPath(), usingData.getHeadPath())
         );
     }
 

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java

@@ -96,6 +96,7 @@ public class EmployeesMQListener {
             employeesAd.setQualificationPath(dto.getQualificationPath());
             employeesAd.setNoCrimeCertificate(dto.getNoCrimeCertificate());
             employeesAd.setCurrentAddress(dto.getCurrentAddress());
+            employeesAd.setHeadPath(dto.getHeadPath());
             employeesAdvisoryInfoService.updateById(employeesAd);
         }
         employeesAdvisoryInfoService.sendYgrz(dto);

nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java

@@ -117,4 +117,5 @@ public class EmployeesApplyMQDto implements Serializable {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日")
     @DateTimeFormat(pattern="yyyy年MM月dd日")
     private Date birthDate;
+    private String headPath;//头像
 }

nursing-unit-common/src/main/java/com/nu/dto/EmployeesStatusMQDto.java

@@ -94,6 +94,8 @@ public class EmployeesStatusMQDto implements Serializable {
     private String noCrimeCertificate;
     /**现住址*/
     private String currentAddress;
+    /**头像*/
+    private String headPath;
     /**有效开始日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
     @DateTimeFormat(pattern="yyyy.MM.dd")

nursing-unit-common/src/main/java/com/nu/dto/OrgApplyInfoMQDto.java

@@ -219,6 +219,7 @@ public class OrgApplyInfoMQDto implements Serializable {
 
     private String auditBy;
     private String auditStatus;
+    private String headPath;;
 
 
 }

nursing-unit-common/src/main/java/com/nu/dto/SysUserMQDto.java

@@ -103,5 +103,6 @@ public class SysUserMQDto implements Serializable {
      * 是否需要初始化密码（0，否，1是）
      */
     private String izInitPassword;
+    private String headPath;
 
 }

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

@@ -151,4 +151,5 @@ public class EmployeesAdvisoryInfoEntity implements Serializable {
     private java.util.Date lastLoginTime;//最近上一次登录时间
 
     private String izInit;//是否需要员工初始化 0否 1是
+    private String headPath;//头像
 }

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

@@ -117,4 +117,5 @@ public class EmployeesApplyEntity implements Serializable {
      * 现住址
      */
     private String currentAddress;
+    private String headPath;
 }

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

@@ -125,4 +125,5 @@ public class EmployeesOrgApiEntity implements Serializable {
     private String noCrimeCertificate;
     /**现住址*/
     private String currentAddress;
+    private String headPath;
 }

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

@@ -78,4 +78,5 @@ public class SuppliersApplyEntity implements Serializable {
     private String applyContent;
     private String applyStatus;
     private String suppliersId;
+    private String headPath;
 }

nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java

@@ -313,4 +313,5 @@ public class SysDepartEntity implements Serializable {
      *密码
      */
     private java.lang.String passwordText;
+    private java.lang.String headPath;
 }

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java

@@ -289,6 +289,7 @@ public class SysDepart implements Serializable {
      * 回复内容
      */
     private java.lang.String replyContent;
+    private java.lang.String headPath;
     /**
      * 回复附件
      */