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

Merge branch 'yewu_20260506' of http://47.115.223.229:8888/yangjun/nursing_unit_java into yewu_20260506

This commit is contained in:
1378012178@qq.com 2026-05-07 16:31:20 +08:00
parent ec6c5c6bf9 e8982acbb6
commit 000cedfaf3
2 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/mapper/xml/EmployeesApplyMapper.xml
View File

@ -3,44 +3,7 @@
<mapper namespace="com.nu.modules.employeesapply.mapper.EmployeesApplyMapper"> <mapper namespace="com.nu.modules.employeesapply.mapper.EmployeesApplyMapper">
<select id="findPage" resultType="com.nu.modules.employeesapply.entity.EmployeesApply"> <select id="findPage" resultType="com.nu.modules.employeesapply.entity.EmployeesApply">
SELECT sup.* FROM ( SELECT * FROM nu_biz_employees_apply
SELECT
b.id AS id,
b.employee_id,
b.name,
b.sex,
b.date_of_birth,
b.tel,
b.national,
b.id_card,
b.married_or_not,
CONCAT(b.height, '') as height,
CONCAT(b.weight, '') as weight,
b.health_status,
b.political_appearance,
b.house_address,
b.emergency_contact,
b.emergency_tel,
b.emergency_relationship,
b.hukou_nature,
b.current_address,
b.id_card_positive,
b.id_card_negative,
b.health_certificate_positive,
b.bank_positive,
b.bank_negative,
b.qualification,
b.no_crime_certificate,
b.create_time,
b.status,
b.modify_status,
b.apply_type,
b.audit_content,
b.iz_history,
b.open_id,
b.head_path
FROM nu_biz_employees_apply b
) sup
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
@ -70,17 +33,16 @@
a.id_card_negative, a.id_card_negative,
a.health_certificate_positive, a.health_certificate_positive,
a.bank_positive, a.bank_positive,
a.bank_negative,
a.qualification, a.qualification,
a.no_crime_certificate, a.no_crime_certificate,
a.head_path,
a.create_time, a.create_time,
b.status, b.status,
b.modify_status, b.modify_status,
b.apply_type, b.apply_type,
b.audit_content, b.audit_content,
b.iz_history, b.iz_history,
b.open_id, b.open_id
a.head_path
FROM nu_biz_employees_info a FROM nu_biz_employees_info a
LEFT JOIN nu_biz_employees_apply b ON a.id = b.employee_id AND b.iz_history = 'N' LEFT JOIN nu_biz_employees_apply b ON a.id = b.employee_id AND b.iz_history = 'N'
WHERE a.del_flag = '0' AND a.iz_freeze = 'N' WHERE a.del_flag = '0' AND a.iz_freeze = 'N'
@ -109,7 +71,6 @@
b.id_card_negative, b.id_card_negative,
b.health_certificate_positive, b.health_certificate_positive,
b.bank_positive, b.bank_positive,
b.bank_negative,
b.qualification, b.qualification,
b.no_crime_certificate, b.no_crime_certificate,
b.create_time, b.create_time,
@ -157,7 +118,6 @@
b.id_card_negative, b.id_card_negative,
b.health_certificate_positive, b.health_certificate_positive,
b.bank_positive, b.bank_positive,
b.bank_negative,
b.qualification, b.qualification,
b.no_crime_certificate, b.no_crime_certificate,
b.create_time, b.create_time,
@ -197,7 +157,6 @@
b.id_card_negative, b.id_card_negative,
b.health_certificate_positive, b.health_certificate_positive,
b.bank_positive, b.bank_positive,
b.bank_negative,
b.qualification, b.qualification,
b.no_crime_certificate, b.no_crime_certificate,
b.create_time, b.create_time,
@ -244,7 +203,6 @@
b.id_card_negative, b.id_card_negative,
b.health_certificate_positive, b.health_certificate_positive,
b.bank_positive, b.bank_positive,
b.bank_negative,
b.qualification, b.qualification,
b.no_crime_certificate, b.no_crime_certificate,
b.create_time, b.create_time,

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
View File

@ -431,7 +431,9 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
@Override @Override
public List<CameraInfoEntity> getCameraInfoList(CameraInfoEntity cameraInfoEntity) { public List<CameraInfoEntity> getCameraInfoList(CameraInfoEntity cameraInfoEntity) {
CameraInfo cameraInfo = new CameraInfo(); CameraInfo cameraInfo = new CameraInfo();
BeanUtils.copyProperties(cameraInfoEntity, cameraInfo); if(cameraInfoEntity != null){
BeanUtils.copyProperties(cameraInfoEntity, cameraInfo);
}
List<CameraInfo> list = baseMapper.findAllList(cameraInfo); List<CameraInfo> list = baseMapper.findAllList(cameraInfo);
List<CameraInfoEntity> listDto = BeanUtil.copyToList(list, CameraInfoEntity.class); List<CameraInfoEntity> listDto = BeanUtil.copyToList(list, CameraInfoEntity.class);
return listDto; return listDto;