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

Compare commits

base: sxyanzhu:e36473eb05b53be8adf92a97b18ae830753971f9
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release
..
compare: sxyanzhu:5570eb7be764ab54d3eca3fa56391ad7a862b6df
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release

No commits in common. "e36473eb05b53be8adf92a97b18ae830753971f9" and "5570eb7be764ab54d3eca3fa56391ad7a862b6df" have entirely different histories.
e36473eb05 ... 5570eb7be7

1 changed files with 6 additions and 15 deletions
Show Stats Expand all files Collapse all files

21
ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java
View File

@ -149,7 +149,7 @@ public class LabourApiController extends BaseController {
if(req.getDataSign(sysApplyConfig.getPrivateKey())){
try {
SurProjectAttendanceGroup surProjectAttendanceGroup = JSONObject.parseObject(req.getData(), SurProjectAttendanceGroup.class);
if(StringUtils.isNotEmpty(surProjectAttendanceGroup.getServerid()) && surProjectAttendanceGroup.getCompanyId()!=null && StringUtils.isNotEmpty(surProjectAttendanceGroup.getCompanyTypeId())){
if(StringUtils.isNotEmpty(surProjectAttendanceGroup.getServerid())){
// 查询当前班组是否已推送
SurProjectAttendanceGroup searchModel = new SurProjectAttendanceGroup();
searchModel.setAppId(sysApplyConfig.getAppId());
@ -158,14 +158,12 @@ public class LabourApiController extends BaseController {
if(CollectionUtils.isNotEmpty(list)){
surProjectAttendanceGroup.setId(list.get(0).getId());
surProjectAttendanceGroup.setAppId(sysApplyConfig.getAppId());
surProjectAttendanceGroup.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceGroup.setCreateBy(list.get(0).getCreateBy());
surProjectAttendanceGroup.setCreateTime(list.get(0).getCreateTime());
surProjectAttendanceGroup.setUpdateBy(sysApplyConfig.getAppId());
surProjectAttendanceGroupService.updateSurProjectAttendanceGroup(surProjectAttendanceGroup);
}else{
surProjectAttendanceGroup.setAppId(sysApplyConfig.getAppId());
surProjectAttendanceGroup.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceGroup.setCreateBy(sysApplyConfig.getAppId());
surProjectAttendanceGroup.setCreateTime(new Date());
surProjectAttendanceGroupService.insertSurProjectAttendanceGroup(surProjectAttendanceGroup);
@ -214,9 +212,8 @@ public class LabourApiController extends BaseController {
surProjectAttendanceGroupService.deleteSurProjectAttendanceGroupByParams(params);
for(int i=0;i<surProjectAttendanceGroupList.size();i++){
SurProjectAttendanceGroup surProjectAttendanceGroup = surProjectAttendanceGroupList.get(i);
if(StringUtils.isNotEmpty(surProjectAttendanceGroup.getServerid()) && surProjectAttendanceGroup.getCompanyId()!=null && StringUtils.isNotEmpty(surProjectAttendanceGroup.getCompanyTypeId())){
if(StringUtils.isNotEmpty(surProjectAttendanceGroup.getServerid())){
surProjectAttendanceGroup.setAppId(sysApplyConfig.getAppId());
surProjectAttendanceGroup.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceGroup.setCreateBy(sysApplyConfig.getAppId());
surProjectAttendanceGroup.setCreateTime(new Date());
saveList.add(surProjectAttendanceGroup);
@ -256,7 +253,7 @@ public class LabourApiController extends BaseController {
if(req.getDataSign(sysApplyConfig.getPrivateKey())){
try {
SurProjectAttendanceUser surProjectAttendanceUser = JSONObject.parseObject(req.getData(), SurProjectAttendanceUser.class);
if(StringUtils.isNotEmpty(surProjectAttendanceUser.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getPhone()) && surProjectAttendanceUser.getGroupId()!=null && surProjectAttendanceUser.getCompanyId()!=null){
if(StringUtils.isNotEmpty(surProjectAttendanceUser.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getPhone())){
// 查询当前人员是否已推送
SurProjectAttendanceUser searchModel = new SurProjectAttendanceUser();
searchModel.setAppId(sysApplyConfig.getAppId());
@ -264,7 +261,6 @@ public class LabourApiController extends BaseController {
List<SurProjectAttendanceUser> list = surProjectAttendanceUserService.selectSurProjectAttendanceUserList(searchModel);
if(CollectionUtils.isNotEmpty(list)){
surProjectAttendanceUser.setId(list.get(0).getId());
surProjectAttendanceUser.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceUser.setAppId(sysApplyConfig.getAppId());
surProjectAttendanceUser.setCreateBy(list.get(0).getCreateBy());
surProjectAttendanceUser.setCreateTime(list.get(0).getCreateTime());
@ -272,7 +268,6 @@ public class LabourApiController extends BaseController {
surProjectAttendanceUserService.updateSurProjectAttendanceUser(surProjectAttendanceUser);
}else{
surProjectAttendanceUser.setAppId(sysApplyConfig.getAppId());
surProjectAttendanceUser.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceUser.setCreateBy(sysApplyConfig.getAppId());
surProjectAttendanceUser.setCreateTime(new Date());
surProjectAttendanceUserService.insertSurProjectAttendanceUser(surProjectAttendanceUser);
@ -321,9 +316,8 @@ public class LabourApiController extends BaseController {
surProjectAttendanceUserService.deleteSurProjectAttendanceUserByParams(params);
for(int i=0;i<surProjectAttendanceUserList.size();i++){
SurProjectAttendanceUser surProjectAttendanceUser = surProjectAttendanceUserList.get(i);
if(StringUtils.isNotEmpty(surProjectAttendanceUser.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getPhone()) && surProjectAttendanceUser.getGroupId()!=null && surProjectAttendanceUser.getCompanyId()!=null){
if(StringUtils.isNotEmpty(surProjectAttendanceUser.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceUser.getPhone())){
surProjectAttendanceUser.setAppId(sysApplyConfig.getAppId());
surProjectAttendanceUser.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceUser.setCreateBy(sysApplyConfig.getAppId());
surProjectAttendanceUser.setCreateTime(new Date());
saveList.add(surProjectAttendanceUser);
@ -363,7 +357,7 @@ public class LabourApiController extends BaseController {
if(req.getDataSign(sysApplyConfig.getPrivateKey())){
try {
SurProjectAttendanceData surProjectAttendanceData = JSONObject.parseObject(req.getData(), SurProjectAttendanceData.class);
if(StringUtils.isNotEmpty(surProjectAttendanceData.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceData.getServerid()) && StringUtils.isNotEmpty(surProjectAttendanceData.getAttendanceType()) && surProjectAttendanceData.getAttendanceTime()!=null){
if(StringUtils.isNotEmpty(surProjectAttendanceData.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceData.getServerid())){
// 查询当前班组人员考勤是否已推送
SurProjectAttendanceData searchModel = new SurProjectAttendanceData();
searchModel.setAppId(sysApplyConfig.getAppId());
@ -372,7 +366,6 @@ public class LabourApiController extends BaseController {
List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(searchModel);
if(CollectionUtils.isNotEmpty(list)){
surProjectAttendanceData.setId(list.get(0).getId());
surProjectAttendanceData.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceData.setAppId(sysApplyConfig.getAppId());
surProjectAttendanceData.setCreateBy(list.get(0).getCreateBy());
surProjectAttendanceData.setCreateTime(list.get(0).getCreateTime());
@ -380,7 +373,6 @@ public class LabourApiController extends BaseController {
surProjectAttendanceDataService.updateSurProjectAttendanceData(surProjectAttendanceData);
}else{
surProjectAttendanceData.setAppId(sysApplyConfig.getAppId());
surProjectAttendanceData.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceData.setCreateBy(sysApplyConfig.getAppId());
surProjectAttendanceData.setCreateTime(new Date());
surProjectAttendanceDataService.insertSurProjectAttendanceData(surProjectAttendanceData);
@ -429,9 +421,8 @@ public class LabourApiController extends BaseController {
surProjectAttendanceDataService.deleteSurProjectAttendanceDataByParams(params);
for(int i=0;i<surProjectAttendanceDataList.size();i++){
SurProjectAttendanceData surProjectAttendanceData = surProjectAttendanceDataList.get(i);
if(StringUtils.isNotEmpty(surProjectAttendanceData.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceData.getServerid()) && StringUtils.isNotEmpty(surProjectAttendanceData.getAttendanceType()) && surProjectAttendanceData.getAttendanceTime()!=null){
if(StringUtils.isNotEmpty(surProjectAttendanceData.getWorkerId()) && StringUtils.isNotEmpty(surProjectAttendanceData.getServerid())){
surProjectAttendanceData.setAppId(sysApplyConfig.getAppId());
surProjectAttendanceData.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceData.setCreateBy(sysApplyConfig.getAppId());
surProjectAttendanceData.setCreateTime(new Date());
saveList.add(surProjectAttendanceData);