Tenlion/twoduty
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
dong_bo0602 2021-04-15 17:49:40 +08:00
commit 50dfe7ef51
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/tenlion/twoduty/service/basiccheckpersonaction/impl/BasicCheckPersonActionServiceImpl.java
View File

@ -60,7 +60,7 @@ public class BasicCheckPersonActionServiceImpl extends DefaultBaseService implem
setAppSaveInfo(token, params); setAppSaveInfo(token, params);
} }
if(StringUtils.isBlank(basicCheckPersonActionVO.getAuditStatus())){ if(StringUtils.isBlank(basicCheckPersonActionVO.getAuditStatus())){
params.put("auditStatus", AuditStatusEnum.NORMAL); params.put("auditStatus", AuditStatusEnum.NORMAL.getAuditStatus());
} }
basicCheckPersonActionDao.save(params); basicCheckPersonActionDao.save(params);
return reportId; return reportId;
@ -105,7 +105,7 @@ public class BasicCheckPersonActionServiceImpl extends DefaultBaseService implem
setAppUpdateInfo(token, params); setAppUpdateInfo(token, params);
} }
if(StringUtils.isBlank(basicCheckPersonActionVO.getAuditStatus())){ if(StringUtils.isBlank(basicCheckPersonActionVO.getAuditStatus())){
params.put("auditStatus", AuditStatusEnum.NORMAL); params.put("auditStatus", AuditStatusEnum.NORMAL.getAuditStatus());
} }
basicCheckPersonActionDao.update(params); basicCheckPersonActionDao.update(params);
} }

4
src/main/java/com/tenlion/twoduty/service/basiccheckpersoninfo/impl/BasicCheckPersonInfoServiceImpl.java
View File

@ -60,7 +60,7 @@ public class BasicCheckPersonInfoServiceImpl extends DefaultBaseService implemen
setAppSaveInfo(token, params); setAppSaveInfo(token, params);
} }
if(StringUtils.isBlank(basicCheckPersonInfoVO.getAuditStatus())){ if(StringUtils.isBlank(basicCheckPersonInfoVO.getAuditStatus())){
params.put("auditStatus", AuditStatusEnum.NORMAL); params.put("auditStatus", AuditStatusEnum.NORMAL.getAuditStatus());
} }
basicCheckPersonInfoDao.save(params); basicCheckPersonInfoDao.save(params);
return reportId; return reportId;
@ -105,7 +105,7 @@ public class BasicCheckPersonInfoServiceImpl extends DefaultBaseService implemen
setAppUpdateInfo(token, params); setAppUpdateInfo(token, params);
} }
if(StringUtils.isBlank(basicCheckPersonInfoVO.getAuditStatus())){ if(StringUtils.isBlank(basicCheckPersonInfoVO.getAuditStatus())){
params.put("auditStatus", AuditStatusEnum.NORMAL); params.put("auditStatus", AuditStatusEnum.NORMAL.getAuditStatus());
} }
basicCheckPersonInfoDao.update(params); basicCheckPersonInfoDao.update(params);
} }

8
src/main/java/com/tenlion/twoduty/service/dutylistform/impl/DutyListFormServiceImpl.java
View File

@ -50,7 +50,7 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
String id = UUIDUtil.getUUID(); String id = UUIDUtil.getUUID();
params.put("reportId",id); params.put("reportId",id);
if(StringUtils.isBlank(partyCleanMeetingVO.getAuditStatus())){ if(StringUtils.isBlank(partyCleanMeetingVO.getAuditStatus())){
params.put("auditStatus",AuditStatusEnum.NORMAL); params.put("auditStatus",AuditStatusEnum.NORMAL.getAuditStatus());
} }
setSaveInfo(params); setSaveInfo(params);
dutyListFormDao.savePartyCleanMeeting(params); dutyListFormDao.savePartyCleanMeeting(params);
@ -61,7 +61,7 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
Map<String,Object> params = HashMapUtil.beanToMap(partyCleanMeetingVO); Map<String,Object> params = HashMapUtil.beanToMap(partyCleanMeetingVO);
setUpdateInfo(params); setUpdateInfo(params);
if(StringUtils.isBlank(partyCleanMeetingVO.getAuditStatus())){ if(StringUtils.isBlank(partyCleanMeetingVO.getAuditStatus())){
params.put("auditStatus",AuditStatusEnum.NORMAL); params.put("auditStatus",AuditStatusEnum.NORMAL.getAuditStatus());
} }
dutyListFormDao.updatePartyCleanMeeting(params); dutyListFormDao.updatePartyCleanMeeting(params);
} }
@ -92,7 +92,7 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
String id = UUIDUtil.getUUID(); String id = UUIDUtil.getUUID();
params.put("reportId",id); params.put("reportId",id);
if(StringUtils.isBlank(heartTalkDTO.getAuditStatus())){ if(StringUtils.isBlank(heartTalkDTO.getAuditStatus())){
params.put("auditStatus",AuditStatusEnum.NORMAL); params.put("auditStatus",AuditStatusEnum.NORMAL.getAuditStatus());
} }
setSaveInfo(params); setSaveInfo(params);
dutyListFormDao.saveHeartTalk(params); dutyListFormDao.saveHeartTalk(params);
@ -103,7 +103,7 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty
Map<String,Object> params = HashMapUtil.beanToMap(heartTalkDTO); Map<String,Object> params = HashMapUtil.beanToMap(heartTalkDTO);
setUpdateInfo(params); setUpdateInfo(params);
if(StringUtils.isBlank(heartTalkDTO.getAuditStatus())){ if(StringUtils.isBlank(heartTalkDTO.getAuditStatus())){
params.put("auditStatus",AuditStatusEnum.NORMAL); params.put("auditStatus",AuditStatusEnum.NORMAL.getAuditStatus());
} }
dutyListFormDao.updateHeartTalk(params); dutyListFormDao.updateHeartTalk(params);
} }

4
src/main/java/com/tenlion/twoduty/service/partypunishinfo/impl/PartyPunishInfoServiceImpl.java
View File

@ -60,7 +60,7 @@ public class PartyPunishInfoServiceImpl extends DefaultBaseService implements IP
setAppSaveInfo(token, params); setAppSaveInfo(token, params);
} }
if(StringUtils.isBlank(partyPunishInfoVO.getAuditStatus())){ if(StringUtils.isBlank(partyPunishInfoVO.getAuditStatus())){
params.put("auditStatus", AuditStatusEnum.NORMAL); params.put("auditStatus", AuditStatusEnum.NORMAL.getAuditStatus());
} }
partyPunishInfoDao.save(params); partyPunishInfoDao.save(params);
return reportId; return reportId;
@ -105,7 +105,7 @@ public class PartyPunishInfoServiceImpl extends DefaultBaseService implements IP
setAppUpdateInfo(token, params); setAppUpdateInfo(token, params);
} }
if(StringUtils.isBlank(partyPunishInfoVO.getAuditStatus())){ if(StringUtils.isBlank(partyPunishInfoVO.getAuditStatus())){
params.put("auditStatus", AuditStatusEnum.NORMAL); params.put("auditStatus", AuditStatusEnum.NORMAL.getAuditStatus());
} }
partyPunishInfoDao.update(params); partyPunishInfoDao.update(params);
} }

4
src/main/java/com/tenlion/twoduty/service/problemclue/impl/ProblemClueServiceImpl.java
View File

@ -60,7 +60,7 @@ public class ProblemClueServiceImpl extends DefaultBaseService implements IProbl
setAppSaveInfo(token, params); setAppSaveInfo(token, params);
} }
if(StringUtils.isBlank(problemClueVO.getAuditStatus())){ if(StringUtils.isBlank(problemClueVO.getAuditStatus())){
params.put("auditStatus", AuditStatusEnum.NORMAL); params.put("auditStatus", AuditStatusEnum.NORMAL.getAuditStatus());
} }
problemClueDao.save(params); problemClueDao.save(params);
return reportId; return reportId;
@ -105,7 +105,7 @@ public class ProblemClueServiceImpl extends DefaultBaseService implements IProbl
setAppUpdateInfo(token, params); setAppUpdateInfo(token, params);
} }
if(StringUtils.isBlank(problemClueVO.getAuditStatus())){ if(StringUtils.isBlank(problemClueVO.getAuditStatus())){
params.put("auditStatus", AuditStatusEnum.NORMAL); params.put("auditStatus", AuditStatusEnum.NORMAL.getAuditStatus());
} }
problemClueDao.update(params); problemClueDao.update(params);
} }

4
src/main/java/com/tenlion/twoduty/service/supervisecheck/impl/SuperviseCheckServiceImpl.java
View File

@ -60,7 +60,7 @@ public class SuperviseCheckServiceImpl extends DefaultBaseService implements ISu
setAppSaveInfo(token, params); setAppSaveInfo(token, params);
} }
if(StringUtils.isBlank(superviseCheckVO.getAuditStatus())){ if(StringUtils.isBlank(superviseCheckVO.getAuditStatus())){
params.put("auditStatus", AuditStatusEnum.NORMAL); params.put("auditStatus", AuditStatusEnum.NORMAL.getAuditStatus());
} }
superviseCheckDao.save(params); superviseCheckDao.save(params);
return reportId; return reportId;
@ -105,7 +105,7 @@ public class SuperviseCheckServiceImpl extends DefaultBaseService implements ISu
setAppUpdateInfo(token, params); setAppUpdateInfo(token, params);
} }
if(StringUtils.isBlank(superviseCheckVO.getAuditStatus())){ if(StringUtils.isBlank(superviseCheckVO.getAuditStatus())){
params.put("auditStatus", AuditStatusEnum.NORMAL); params.put("auditStatus", AuditStatusEnum.NORMAL.getAuditStatus());
} }
superviseCheckDao.update(params); superviseCheckDao.update(params);
} }