yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
1378012178@qq.com 2025-06-25 09:03:10 +08:00
parent 30aaa37e29 4ca066f446
commit 3832963323
8 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/IEmployessAdvisioryInfoApi.java
View File

@ -12,4 +12,6 @@ public interface IEmployessAdvisioryInfoApi {
int updateById(EmployeesAdvisoryInfoEntity eployeesAdvisoryInfoEntity);
List<EmployeesAdvisoryInfoEntity> queryAuditInfo(String tel);
int updateByTel(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity);
}

7
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/entity/EmployeesAdvisoryInfoEntity.java
View File

@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@ -34,6 +35,7 @@ public class EmployeesAdvisoryInfoEntity implements Serializable {
/**联系电话*/
private String tel;
/**状态 1审核中 2审核完成 3驳回 */
@Dict(dicCode = "org_apply_status")
private String status;
/**审核备注*/
private String content;
@ -113,4 +115,9 @@ public class EmployeesAdvisoryInfoEntity implements Serializable {
private String qualificationPath;
/**无犯罪正面*/
private String noCrimeCertificate;
private String advisoryType;
private String izYg;
private String izJs;
private String izJg;
}

4
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java
View File

@ -116,6 +116,10 @@ public class NuBizAdvisoryInfo implements Serializable {
@ApiModelProperty(value = "是否入住0否 1是(是否入住过）")
private String izCheckIn;
private String izYg;//是否是员工 0否 1是
private String izJs;//是否是家属 0否 1是
private String izJg;//是否是机构 0否 1是
@TableField(exist = false)
private String advisoryTypeName;

1
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/entity/NuEmployeesAdvisoryInfo.java
View File

@ -53,6 +53,7 @@ public class NuEmployeesAdvisoryInfo implements Serializable {
/**状态 1审核中 2审核完成 3驳回 */
@Excel(name = "状态 1审核中 2审核完成 3驳回 ", width = 15)
@ApiModelProperty(value = "状态 1审核中 2审核完成 3驳回 ")
@Dict(dicCode = "org_apply_status")
private java.lang.String status;
/**审核备注*/
@Excel(name = "审核备注", width = 15)

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/NuEmployeesAdvisoryInfoMapper.java
View File

@ -2,6 +2,7 @@ package com.nu.modules.nuEmployeesAdvisoryInfo.mapper;
import java.util.List;
import com.nu.modules.EmployessInfo.entity.EmployeesAdvisoryInfoEntity;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.nuEmployeesAdvisoryInfo.entity.NuEmployeesAdvisoryInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface NuEmployeesAdvisoryInfoMapper extends BaseMapper<NuEmployeesAdvisoryInfo> {
void updateByTel(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity);
}

18
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml
View File

@ -2,4 +2,22 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.nuEmployeesAdvisoryInfo.mapper.NuEmployeesAdvisoryInfoMapper">
<update id="updateByTel">
update nu_biz_advisory_info
<set>
<if test="advisoryType != null and advisoryType != ''">
advisory_type = #{advisoryType},
</if>
<if test="izYg != null and izYg != ''">
iz_yg = #{izYg},
</if>
<if test="izJg != null and izJg != ''">
iz_jg = #{izJg},
</if>
<if test="izJs != null and izJs != ''">
iz_js = #{izJs},
</if>
</set>
where tel = #{tel}
</update>
</mapper>

8
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
View File

@ -1,8 +1,10 @@
package com.nu.modules.nuEmployeesAdvisoryInfo.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi;
import com.nu.modules.EmployessInfo.entity.EmployeesAdvisoryInfoEntity;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo;
import com.nu.modules.nuEmployeesAdvisoryInfo.entity.NuEmployeesAdvisoryInfo;
import com.nu.modules.nuEmployeesAdvisoryInfo.mapper.NuEmployeesAdvisoryInfoMapper;
import com.nu.modules.nuEmployeesAdvisoryInfo.service.INuEmployeesAdvisoryInfoService;
@ -57,4 +59,10 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
.collect(Collectors.toList());
return result;
}
@Override
public int updateByTel(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity) {
baseMapper.updateByTel(employeesAdvisoryInfoEntity);
return 0;
}
}

16
nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java
View File

@ -1,5 +1,7 @@
package com.nu.modules.wechat.orgapplyinfo.api;
import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi;
import com.nu.modules.EmployessInfo.entity.EmployeesAdvisoryInfoEntity;
import com.nu.modules.orgapplyinfo.api.IOrgApplyInfoApi;
import com.nu.modules.orgapplyinfo.entity.OrgApplyInfoApiEntity;
import org.apache.commons.lang.StringUtils;
@ -17,6 +19,9 @@ public class OrgApplyInfoApi {
@Autowired
private IOrgApplyInfoApi orgApplyInfoApi;
@Autowired
private IEmployessAdvisioryInfoApi employessAdvisioryInfoApi;
/**
* 新增/编辑机构加盟申请信息
* @param orgApplyInfoApiEntity
@ -25,6 +30,17 @@ public class OrgApplyInfoApi {
@AutoLog(value = "新增/编辑机构加盟申请信息")
@PostMapping("/save")
public Result<Object> save(@RequestBody OrgApplyInfoApiEntity orgApplyInfoApiEntity) {
System.out.println("-----------新增/编辑机构加盟申请信息--------tel------------"+orgApplyInfoApiEntity.getTel());
if(StringUtils.isNotBlank(orgApplyInfoApiEntity.getTel())){
EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity = new EmployeesAdvisoryInfoEntity();
employeesAdvisoryInfoEntity.setTel(orgApplyInfoApiEntity.getTel());
employeesAdvisoryInfoEntity.setAdvisoryType("3");
employeesAdvisoryInfoEntity.setIzJg("1");
System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity1------------"+employeesAdvisoryInfoEntity.getTel());
System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity2------------"+employeesAdvisoryInfoEntity.getAdvisoryType());
System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity3------------"+employeesAdvisoryInfoEntity.getIzJg());
employessAdvisioryInfoApi.updateByTel(employeesAdvisoryInfoEntity);
}
if (StringUtils.isNotBlank(orgApplyInfoApiEntity.getId())) {
orgApplyInfoApi.updateById(orgApplyInfoApiEntity);
return Result.ok("保存成功！");