From 1b7f9a70dabf518d0ebdd2809c03d5022fc19794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= Date: Fri, 31 Mar 2023 11:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=A1=8C=E4=B8=9A=E7=9B=91?= =?UTF-8?q?=E7=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/rzyc/bean/TreeModel.java | 24 +++++ .../com/rzyc/mapper/SysUnitTradeMapper.java | 18 ++++ .../com/rzyc/mapper/SysWarningMapper.java | 3 +- .../rzyc/mapper/ent/BaseInClassMapper.java | 3 + .../rzyc/mapper/user/ListPerformMapper.java | 3 + .../com/rzyc/mapper/user/SysUserMapper.java | 2 +- .../java/com/rzyc/model/SysUnitTrade.java | 91 +++++++++++++++++++ .../java/com/rzyc/model/ent/BaseInClass.java | 2 + .../resources/mapper/SysUnitTradeMapper.xml | 19 ++++ .../resources/mapper/SysWarningMapper.xml | 4 +- .../mapper/ent/BaseInClassMapper.xml | 11 +++ .../mapper/user/ListPerformMapper.xml | 6 ++ .../resources/mapper/user/SysUserMapper.xml | 10 +- .../com/rzyc/controller/BaseController.java | 7 +- .../rzyc/controller/PcPersonalController.java | 1 + .../rzyc/controller/SettingController.java | 31 +++++++ .../java/com/rzyc/service/TaskService.java | 85 +++++++++++++++-- 17 files changed, 308 insertions(+), 12 deletions(-) create mode 100644 inventory-dao/src/main/java/com/rzyc/mapper/SysUnitTradeMapper.java create mode 100644 inventory-dao/src/main/java/com/rzyc/model/SysUnitTrade.java create mode 100644 inventory-dao/src/main/resources/mapper/SysUnitTradeMapper.xml diff --git a/inventory-dao/src/main/java/com/rzyc/bean/TreeModel.java b/inventory-dao/src/main/java/com/rzyc/bean/TreeModel.java index d89cc58..2303389 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/TreeModel.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/TreeModel.java @@ -1,5 +1,7 @@ package com.rzyc.bean; +import io.swagger.annotations.ApiModelProperty; + import java.util.List; public class TreeModel { @@ -11,8 +13,30 @@ public class TreeModel { private String code; + @ApiModelProperty("关联id") + private String unitTradeId; + + @ApiModelProperty("是否选中 1:选中 2：未选中") + private Integer isSelect; + private Listchildren; + public String getUnitTradeId() { + return unitTradeId; + } + + public void setUnitTradeId(String unitTradeId) { + this.unitTradeId = unitTradeId; + } + + public Integer getIsSelect() { + return isSelect; + } + + public void setIsSelect(Integer isSelect) { + this.isSelect = isSelect; + } + public String getCode() { return code; } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysUnitTradeMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/SysUnitTradeMapper.java new file mode 100644 index 0000000..b2ff0c1 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/SysUnitTradeMapper.java @@ -0,0 +1,18 @@ +package com.rzyc.mapper; + +import com.rzyc.model.SysUnitTrade; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 部门行业监管 Mapper 接口 + *

+ * + * @author + * @since 2023-03-31 + */ +@Repository +public interface SysUnitTradeMapper extends BaseMapper { + +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningMapper.java index e099e1d..1ec1b42 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningMapper.java @@ -17,6 +17,7 @@ import org.springframework.stereotype.Repository; public interface SysWarningMapper extends BaseMapper { /*查询预警数量*/ - Integer countByTargetId(@Param("targetId") String targetId); + Integer countByTargetId(@Param("targetId") String targetId, + @Param("typeId") String typeId); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/BaseInClassMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/BaseInClassMapper.java index dd48525..93afec0 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/BaseInClassMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/BaseInClassMapper.java @@ -40,6 +40,9 @@ public interface BaseInClassMapper { /*行业树形结构*/ ListfindInClass(); + /*单位行业监管信息*/ + ListunitTradeList(@Param("unitId") String unitId); + /*查询所有*/ ListfindAll(); diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java index 9493d26..bf66b81 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java @@ -130,4 +130,7 @@ public interface ListPerformMapper { List communityPerformInfo(@Param("areaCode") String areaCode, @Param("sysYear") String sysYear); + /*上级岗位*/ + List topListperformList(@Param("listperformId") String listperformId); + } 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 c423934..ee0058b 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 @@ -194,6 +194,6 @@ public interface SysUserMapper { List selectTransferor(); /*岗位用户*/ - List findBySysTitle(@Param("sysTitle") String sysTitle); + List findBySysTitle(@Param("sysTitles") List sysTitles); } diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysUnitTrade.java b/inventory-dao/src/main/java/com/rzyc/model/SysUnitTrade.java new file mode 100644 index 0000000..f648c3e --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/SysUnitTrade.java @@ -0,0 +1,91 @@ +package com.rzyc.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 部门行业监管 + *

+ * + * @author + * @since 2023-03-31 + */ +@TableName("sys_unit_trade") +@ApiModel(value="SysUnitTrade对象", description="部门行业监管") +public class SysUnitTrade implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "部门行业监管id") + @TableId("unit_trade_id") + private String unitTradeId; + + @ApiModelProperty(value = "部门id") + @TableField("unit_id") + private String unitId; + + @ApiModelProperty(value = "行业id") + @TableField("in_class_id") + private String inClassId; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + public String getUnitTradeId() { + return unitTradeId; + } + + public void setUnitTradeId(String unitTradeId) { + this.unitTradeId = unitTradeId; + } + public String getUnitId() { + return unitId; + } + + public void setUnitId(String unitId) { + this.unitId = unitId; + } + public String getInClassId() { + return inClassId; + } + + public void setInClassId(String inClassId) { + this.inClassId = inClassId; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + @Override + public String toString() { + return "SysUnitTrade{" + + "unitTradeId=" + unitTradeId + + ", unitId=" + unitId + + ", inClassId=" + inClassId + + ", createTime=" + createTime + + ", createBy=" + createBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/BaseInClass.java b/inventory-dao/src/main/java/com/rzyc/model/ent/BaseInClass.java index c52d83b..ad63e50 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/BaseInClass.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/BaseInClass.java @@ -51,6 +51,8 @@ public class BaseInClass implements Serializable { private String modifiedby; + private String unitTradeId; + private List baseInClassList; public Integer getInType() { diff --git a/inventory-dao/src/main/resources/mapper/SysUnitTradeMapper.xml b/inventory-dao/src/main/resources/mapper/SysUnitTradeMapper.xml new file mode 100644 index 0000000..7fdbdcf --- /dev/null +++ b/inventory-dao/src/main/resources/mapper/SysUnitTradeMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + unit_trade_id, unit_id, in_class_id, create_time, create_by + + + diff --git a/inventory-dao/src/main/resources/mapper/SysWarningMapper.xml b/inventory-dao/src/main/resources/mapper/SysWarningMapper.xml index 7fe4505..780d006 100644 --- a/inventory-dao/src/main/resources/mapper/SysWarningMapper.xml +++ b/inventory-dao/src/main/resources/mapper/SysWarningMapper.xml @@ -24,8 +24,10 @@ diff --git a/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml b/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml index 2b05d81..82240c3 100644 --- a/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml @@ -364,6 +364,7 @@ + @@ -372,6 +373,16 @@ from BaseInClass t1 + + + + diff --git a/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml b/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml index ae285da..8d9a652 100644 --- a/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml +++ b/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml @@ -868,4 +868,10 @@ order by su.community_code asc,lf.PerformClassCode asc + + + diff --git a/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml b/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml index c4aa041..d084c90 100644 --- a/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml +++ b/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml @@ -1431,6 +1431,14 @@ diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index 3ac0fae..09385b5 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -556,6 +556,10 @@ public class BaseController { @Autowired protected EntPostListMapper entPostListMapper; + //部门行业关联 + @Autowired + protected SysUnitTradeMapper sysUnitTradeMapper; + /** * 岗位不需要的字符串 @@ -1778,7 +1782,7 @@ public class BaseController { * @return * @throws Exception */ - private JSONArray handleTreeModel(List treeModels)throws Exception{ + public JSONArray handleTreeModel(List treeModels)throws Exception{ List> data = new ArrayList<>(); for(TreeModel treeModel : treeModels){ if(StringUtils.isBlank(treeModel.getParentId())){ @@ -1789,6 +1793,7 @@ public class BaseController { entUserMap.put("id",treeModel.getId()); entUserMap.put("parentId",treeModel.getParentId()); entUserMap.put("code",treeModel.getCode()); + entUserMap.put("isSelect",treeModel.getIsSelect()); data.add(entUserMap); } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index 49181d9..8fab826 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -2693,4 +2693,5 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { return result; } + } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java b/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java index 227307d..76c94f8 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java @@ -8,6 +8,7 @@ import com.common.utils.model.*; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.rzyc.advice.LoginAuth; +import com.rzyc.bean.TreeModel; import com.rzyc.bean.ent.*; import com.rzyc.bean.setting.AreaPageDto; import com.rzyc.bean.setting.ChangeAreaDto; @@ -16,6 +17,7 @@ import com.rzyc.bean.user.dto.UnitAuthChangeDto; import com.rzyc.enums.AreaLevel; import com.rzyc.model.SysDocumenttemp; import com.rzyc.model.SysOrg; +import com.rzyc.model.ent.BaseInClass; import com.rzyc.model.user.SysAuth; import com.rzyc.model.user.SysUnitRole; import com.rzyc.model.user.SysUser; @@ -1214,4 +1216,33 @@ public class SettingController extends BaseController{ return result; } + /** + * 部门行业树形结构 + * @version v1.0 + * @author dong + * @date 2023/3/31 11:26 + */ + @ApiOperation(value = "部门行业树形结构", notes = "部门行业树形结构") + @GetMapping("unitInClass") + @ApiImplicitParam(name = "unitId",value = "部门id",required = true) + @ResponseBody + public MultiResult unitInClass(String unitId)throws Exception{ + MultiResult result = new MultiResult<>(); + + List treeModels = baseInClassMapper.unitTradeList(unitId); + if(null != treeModels && treeModels.size() > 0){ + for (TreeModel treeModel : treeModels){ + if(StringUtils.isNotBlank(treeModel.getUnitTradeId())){ + treeModel.setIsSelect(1); + }else{ + treeModel.setIsSelect(2); + } + } + } + JSONArray jsonArray = handleTreeModel(treeModels); + List treeModelList = JSONArray.parseArray(jsonArray.toJSONString(),TreeModel.class); + result.setData(treeModelList); + return result; + } + } 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 d82f32c..7c56122 100644 --- a/inventory-gov/src/main/java/com/rzyc/service/TaskService.java +++ b/inventory-gov/src/main/java/com/rzyc/service/TaskService.java @@ -13,6 +13,7 @@ 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.ListPerform; import com.rzyc.model.user.SysUser; import org.springframework.stereotype.Service; @@ -43,6 +44,8 @@ public class TaskService extends BaseController { configureTasksEditDanger(); //未完成履职任务提醒 addTaskWarn(); + //下级未履行上级任务预警 + addSubordinateTaskWarn(); }catch (Exception e){ e.printStackTrace(); } @@ -205,7 +208,7 @@ public class TaskService extends BaseController { public void addTroubleWarn(BookEntHT entHT)throws Exception{ //查询是否预警 - Integer warnNum = sysWarningMapper.countByTargetId(entHT.getBookenthtid()); + Integer warnNum = sysWarningMapper.countByTargetId(entHT.getBookenthtid(),WarnTypeEnum.TROUBLE.getType()); if(0 == warnNum){ //未预警过就新增预警 List chkPeople = chkPersonMapper.findByCheckIdAll(entHT.getBookentcheckid()); @@ -262,14 +265,17 @@ public class TaskService extends BaseController { if(null != oaTasks && oaTasks.size() > 0){ for (OATask oaTask : oaTasks){ //查询是否预警 - Integer warnNum = sysWarningMapper.countByTargetId(oaTask.getOataskid()); + Integer warnNum = sysWarningMapper.countByTargetId(oaTask.getOataskid(),WarnTypeEnum.GOV_LIST.getType()); if(0 == warnNum){ ListFactor listFactor = listFactorMapper.selectByPrimaryKey(oaTask.getOtcid()); if(null != listFactor){ + List sysTitles = new ArrayList<>(); + sysTitles.add(listFactor.getListperformid()); + //查询任务用户 - List sysUsers = sysUserMapper.findBySysTitle(listFactor.getListperformid()); + List sysUsers = sysUserMapper.findBySysTitle(sysTitles); if(null != sysUsers && sysUsers.size() > 0){ String warnInfo = "您的履职任务：<"+oaTask.getSubject()+">超期未完成。"; @@ -299,14 +305,79 @@ public class TaskService extends BaseController { } } - - - - } + } + } + } + + /** + * 下级未履行上级任务预警 + * @version v1.0 + * @author dong + * @date 2023/3/31 9:48 + */ + public void addSubordinateTaskWarn()throws Exception{ + + //未完成履职任务 + List oaTasks = oaTaskMapper.notCompleteTask(); + if(null != oaTasks && oaTasks.size() > 0){ + for (OATask oaTask : oaTasks){ + //查询是否预警 + Integer warnNum = sysWarningMapper.countByTargetId(oaTask.getOataskid(),WarnTypeEnum.TASK.getType()); + if(0 == warnNum){ + + ListFactor listFactor = listFactorMapper.selectByPrimaryKey(oaTask.getOtcid()); + if(null != listFactor){ + List sysTitles = new ArrayList<>(); + List listPerforms = listPerformMapper.topListperformList(listFactor.getListperformid()); + if(null != listPerforms && listPerforms.size() > 0){ + for (ListPerform listPerform : listPerforms){ + sysTitles.add(listPerform.getListperformid()); + } + + //查询任务用户 + List sysUsers = sysUserMapper.findBySysTitle(sysTitles); + if(null != sysUsers && sysUsers.size() > 0){ + + String warnInfo = ""; + ListPerform listPerform = listPerformMapper.selectListPerformDetail(listFactor.getListperformid()); + if(null != listPerform){ + ListPerform topPerform = listPerformMapper.selectByPrimaryKey(listPerform.getSupclassid()); + if(null != topPerform){ + warnInfo = topPerform.getPerformclassname()+listPerform.getPerformclassname(); + } + } + + warnInfo = 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.TASK.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.TASK.getType()); + warningUser.setState(1); + warningUser.setDelState(DelState.NOT_DEL.getState()); + warningUser.setCreateTime(new Date()); + warningUser.setModifyTime(new Date()); + sysWarningUserMapper.insert(warningUser); + } + } + } + } + } } } }