diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/user/SysUserMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/user/SysUserMapper.java index 8512bd9..c423934 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/user/SysUserMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/user/SysUserMapper.java @@ -193,4 +193,7 @@ public interface SysUserMapper { //查询流转人 List selectTransferor(); + /*岗位用户*/ + List findBySysTitle(@Param("sysTitle") String sysTitle); + } diff --git a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml index 7323bc0..13ee64a 100644 --- a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml @@ -656,7 +656,9 @@ select su.SysUserId ,su.SysDeptName ,su.ChinaName FROM SysUser su + + + diff --git a/inventory-gov/src/main/java/com/rzyc/service/TaskService.java b/inventory-gov/src/main/java/com/rzyc/service/TaskService.java index e01187d..d82f32c 100644 --- a/inventory-gov/src/main/java/com/rzyc/service/TaskService.java +++ b/inventory-gov/src/main/java/com/rzyc/service/TaskService.java @@ -12,6 +12,7 @@ import com.rzyc.model.check.BookEntHT; import com.rzyc.model.check.BookenthtCompany; import com.rzyc.model.check.ChkPerson; import com.rzyc.model.ent.SysEnterprise; +import com.rzyc.model.user.ListFactor; import com.rzyc.model.user.SysUser; import org.springframework.stereotype.Service; @@ -40,6 +41,8 @@ public class TaskService extends BaseController { performTask(); //隐患超时 configureTasksEditDanger(); + //未完成履职任务提醒 + addTaskWarn(); }catch (Exception e){ e.printStackTrace(); } @@ -217,7 +220,7 @@ public class TaskService extends BaseController { if(null != sysEnterprise){ warnInfo = sysEnterprise.getEntname(); } - warnInfo = warnInfo + "的隐患<" + entHT.getHiddenarea() + ">超期未整改"; + warnInfo = warnInfo + "的隐患<" + entHT.getHiddenarea() + ">超期未整改。"; SysWarning warning = new SysWarning(); warning.setWarningId(RandomNumber.getUUid()); @@ -246,6 +249,12 @@ public class TaskService extends BaseController { } } + /** + * 政府履职清单过期未履行 + * @version v1.0 + * @author dong + * @date 2023/3/31 9:48 + */ public void addTaskWarn()throws Exception{ //未完成履职任务 @@ -254,6 +263,50 @@ public class TaskService extends BaseController { for (OATask oaTask : oaTasks){ //查询是否预警 Integer warnNum = sysWarningMapper.countByTargetId(oaTask.getOataskid()); + if(0 == warnNum){ + + ListFactor listFactor = listFactorMapper.selectByPrimaryKey(oaTask.getOtcid()); + if(null != listFactor){ + + //查询任务用户 + List sysUsers = sysUserMapper.findBySysTitle(listFactor.getListperformid()); + if(null != sysUsers && sysUsers.size() > 0){ + + String warnInfo = "您的履职任务:<"+oaTask.getSubject()+">超期未完成。"; + SysWarning warning = new SysWarning(); + warning.setWarningId(RandomNumber.getUUid()); + warning.setTargetId(oaTask.getOataskid()); + warning.setWarningInfo(warnInfo); + warning.setWarningTime(new Date()); + warning.setTypeId(WarnTypeEnum.GOV_LIST.getType()); + warning.setDelState(DelState.NOT_DEL.getState()); + warning.setCreateTime(new Date()); + warning.setModifyTime(new Date()); + sysWarningMapper.insert(warning); + + for (SysUser sysUser : sysUsers){ + SysWarningUser warningUser = new SysWarningUser(); + warningUser.setWarningUserId(RandomNumber.getUUid()); + warningUser.setWarningId(warning.getWarningId()); + warningUser.setUserId(sysUser.getSysuserid()); + warningUser.setTypeId(WarnTypeEnum.GOV_LIST.getType()); + warningUser.setState(1); + warningUser.setDelState(DelState.NOT_DEL.getState()); + warningUser.setCreateTime(new Date()); + warningUser.setModifyTime(new Date()); + sysWarningUserMapper.insert(warningUser); + } + + } + } + + + + + } + + + } } }