sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

dev_xds
haha 2024-03-23 01:27:34 +08:00
parent 32b5398830 f5205e4dba
commit ce59957910
2 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java
View File

@ -22,10 +22,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@ -257,6 +254,46 @@ PublicsController extends BaseController {
}else{
list = surProjectAttendanceDataService.initOtherData(data);
}
List<SurProjectAttendanceData> dataList = new ArrayList<>();
for(Map<String,Object> map:list){
SurProjectAttendanceData attendanceData = new SurProjectAttendanceData();
attendanceData.setCfgid(cfg.getId());
attendanceData.setAppId(map.get("app_id").toString());
attendanceData.setProjectId(cfg.getProjectId());
attendanceData.setProjectName(cfg.getProjectName());
attendanceData.setDeptId(cfg.getSubDeptId());
attendanceData.setDeptName(cfg.getUnitName());
attendanceData.setVendorsCode(cfg.getVendorsCode());
attendanceData.setServerid(map.get("serverid").toString());
attendanceData.setWorkerId(map.get("workerId").toString());
attendanceData.setWorkerName(map.get("name").toString());
attendanceData.setIdentification(map.get("identification").toString());
attendanceData.setWorkerPhoto(Convert.toStr(map.get("recentPhoto")));
attendanceData.setWorkerGender(Convert.toLong(map.get("gender")));
attendanceData.setBirthDate(Convert.toLong(map.get("birthDate")));
attendanceData.setEthnic(map.get("ethnic").toString());
attendanceData.setNativePlace(map.get("nativePlace").toString());
attendanceData.setPhone(map.get("phone").toString());
attendanceData.setWorkTypeName(map.get("workTypeName").toString());
attendanceData.setSpecWorkType(Convert.toInt(map.get("specWorkType")));
attendanceData.setGroupName(map.get("groupName").toString());
attendanceData.setCompanyTypeId(Convert.toStr(map.get("companyTypeId"),"0"));
attendanceData.setCompanyName(map.get("companyName").toString());
attendanceData.setAttendanceTime(map.get("inTime").toString());
attendanceData.setAttendanceOutTime(map.get("outTime").toString());
attendanceData.setScanPhoto(Convert.toStr(map.get("scanPhoto")));
attendanceData.setTeamId(Convert.toLong(map.get("teamId")));
attendanceData.setWorkTypeCode(Convert.toStr(map.get("workTypeCode")));
attendanceData.setCompanyId(Convert.toStr(map.get("companyId")));
attendanceData.setVendorId(Convert.toLong(map.get("vendorId")));
attendanceData.setDeviceCode(Convert.toStr(map.get("device_code")));
attendanceData.setIsDel(Convert.toLong(map.get("is_del")));
attendanceData.setCreateBy("数据迁移格式化");
attendanceData.setCreateTime(new Date());
dataList.add(attendanceData);
//surProjectAttendanceDataService.add(attendanceData);
}
redisCache.setCacheObject("PUBLICS.V1.initAttendanceData",dataList,30*24,TimeUnit.HOURS);
}
}
return success();

8
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
View File

@ -328,8 +328,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="initOtherData" parameterType="map" resultType="map">
select d.workerId,u.companyId,u.companyName,u.`name`,d.identification,u.recentPhoto,u.gender,u.birthDate,u.ethnic,u.nativePlace,u.phone,
u.workTypeName,u.specWorkType,u.groupName,g.companyTypeId,d.teamId,u.workTypeCode,d.vendorId,d.device_code
select d.workerId,d.app_id,d.serverid,u.companyId,u.companyName,u.`name`,d.identification,u.recentPhoto,u.gender,u.birthDate,u.ethnic,u.nativePlace,u.phone,
u.workTypeName,u.specWorkType,u.groupName,g.companyTypeId,d.teamId,u.workTypeCode,d.vendorId,d.device_code,d.scanPhoto,d.is_del
from sur_project_attendance_data d
left JOIN sur_project_attendance_user u on d.workerId = u.workerId and d.cfgid = u.cfgid
left join sur_project_attendance_group g on u.groupId = g.serverid and g.cfgid = u.cfgid
@ -338,8 +338,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="initHuaZhuData" parameterType="map" resultType="map">
select d.workerId,u.companyId,u.companyName,u.`name`,d.identification,u.recentPhoto,u.gender,u.birthDate,u.ethnic,u.nativePlace,u.phone,
u.workTypeName,u.specWorkType,u.groupName,d.teamId,u.workTypeCode,d.vendorId,d.device_code,
select d.workerId,d.app_id,d.serverid,u.companyId,u.companyName,u.`name`,d.identification,u.recentPhoto,u.gender,u.birthDate,u.ethnic,u.nativePlace,u.phone,
u.workTypeName,u.specWorkType,u.groupName,d.teamId,u.workTypeCode,d.vendorId,d.device_code,d.scanPhoto,d.is_del,
CASE WHEN sd.type_flag = 2 THEN '1' WHEN sd.type_flag = 3 THEN '2' WHEN sd.type_flag = 4 THEN '8' else '0' end as companyTypeId
from sur_project_attendance_data d
left JOIN sur_project_attendance_user u on d.workerId = u.workerId and d.cfgid = u.cfgid