ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企业清单未落实预警开发

Browse Source
This commit is contained in:
韩国东 2023-03-31 14:29:26 +08:00
parent 1b7f9a70da
commit 2b111c41cb
9 changed files with 165 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
inventory-dao/src/main/java/com/rzyc/bean/setting/UnitInClassChangeDto.java Normal file
View File

@ -0,0 +1,38 @@
package com.rzyc.bean.setting;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotNull;
/**
* @author dong
* @date 2023-03-31 13:34
* @Version V1.0
*/
@ApiModel("")
public class UnitInClassChangeDto {
@NotNull(message = "单位不能为空")
@ApiModelProperty(value = "单位id",required = true)
private String unitId;
@ApiModelProperty("行业id 多个逗号隔开")
private String inClassIds;
public String getUnitId() {
return unitId;
}
public void setUnitId(String unitId) {
this.unitId = unitId;
}
public String getInClassIds() {
return inClassIds;
}
public void setInClassIds(String inClassIds) {
this.inClassIds = inClassIds;
}
}

4
inventory-dao/src/main/java/com/rzyc/mapper/EntPostTaskMapper.java
View File

@ -13,7 +13,7 @@ import java.util.List;
* Mapper 接口
* </p>
*
* @author
* @author
* @since 2022-10-09
*/
@Repository
@ -99,4 +99,6 @@ public interface EntPostTaskMapper extends BaseMapper<EntPostTask> {
* */
int updateTaskState(String entPostTaskId);
/*企业未完成任务*/
List<EntPostTask> notCompleteTask();
}

4
inventory-dao/src/main/java/com/rzyc/mapper/SysUnitTradeMapper.java
View File

@ -2,6 +2,7 @@ package com.rzyc.mapper;
import com.rzyc.model.SysUnitTrade;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
/**
@ -15,4 +16,7 @@ import org.springframework.stereotype.Repository;
@Repository
public interface SysUnitTradeMapper extends BaseMapper<SysUnitTrade> {
/*删除部门行业监管*/
Integer delByUnitId(@Param("unitId") String unitId);
}

3
inventory-dao/src/main/java/com/rzyc/mapper/user/SysUserMapper.java
View File

@ -196,4 +196,7 @@ public interface SysUserMapper {
/*岗位用户*/
List<SysUser> findBySysTitle(@Param("sysTitles") List<String> sysTitles);
/*行业监管部门用户列表*/
List<SysUser> inClassUser(@Param("inClassId") String inClassId);
}

11
inventory-dao/src/main/resources/mapper/EntPostTaskMapper.xml
View File

@ -155,6 +155,17 @@
update ent_post_task set task_state = 2 where task_id = #{entPostTaskId}
</update>
<!--企业未完成任务-->
<select id="notCompleteTask" resultMap="BaseResultMap">
SELECT pt.*
FROM `ent_post_task` pt
LEFT JOIN `sysenterprise` se ON pt.`enterprise_id` = se.`SysEnterpriseId`
WHERE pt.task_state != 2
AND se.`State` = '启用'
AND YEAR(pt.`start_time`) =YEAR(NOW())
AND pt.`ent_time` &lt; NOW();
</select>
</mapper>

5
inventory-dao/src/main/resources/mapper/SysUnitTradeMapper.xml
View File

@ -16,4 +16,9 @@
unit_trade_id, unit_id, in_class_id, create_time, create_by
</sql>
<!--删除部门行业监管-->
<delete id="delByUnitId">
DELETE FROM sys_unit_trade WHERE unit_id = #{unitId}
</delete>
</mapper>

9
inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml
View File

@ -1439,6 +1439,15 @@
#{sysTitle}
</foreach>
</if>
</select>
<!--行业监管部门用户列表-->
<select id="inClassUser" resultMap="BaseResultMap">
SELECT su.*
FROM SysUser su
LEFT JOIN sysunit st ON su.`SysUnitOrEntId` = st.`SysUnitId`
LEFT JOIN `sys_unit_trade` ut ON ut.`unit_id` = st.`SysUnitId`
WHERE ut.`in_class_id` = #{inClassId}
</select>
</mapper>

39
inventory-gov/src/main/java/com/rzyc/controller/SettingController.java
View File

@ -12,11 +12,14 @@ import com.rzyc.bean.TreeModel;
import com.rzyc.bean.ent.*;
import com.rzyc.bean.setting.AreaPageDto;
import com.rzyc.bean.setting.ChangeAreaDto;
import com.rzyc.bean.setting.UnitInClassChangeDto;
import com.rzyc.bean.user.*;
import com.rzyc.bean.user.dto.UnitAuthChangeDto;
import com.rzyc.enums.AreaLevel;
import com.rzyc.mapper.SysUnitTradeMapper;
import com.rzyc.model.SysDocumenttemp;
import com.rzyc.model.SysOrg;
import com.rzyc.model.SysUnitTrade;
import com.rzyc.model.ent.BaseInClass;
import com.rzyc.model.user.SysAuth;
import com.rzyc.model.user.SysUnitRole;
@ -1217,12 +1220,12 @@ public class SettingController extends BaseController{
}
/**
* 部门行业树形结构
* 部门监管行业树形结构
* @version v1.0
* @author dong
* @date 2023/3/31 11:26
*/
@ApiOperation(value = "部门行业树形结构", notes = "部门行业树形结构")
@ApiOperation(value = "部门监管行业树形结构", notes = "部门监管行业树形结构")
@GetMapping("unitInClass")
@ApiImplicitParam(name = "unitId",value = "部门id",required = true)
@ResponseBody
@ -1245,4 +1248,36 @@ public class SettingController extends BaseController{
return result;
}
/**
* 部门监管行业树形结构
* @version v1.0
* @author dong
* @date 2023/3/31 13:34
*/
@ApiOperation(value = "部门监管行业修改", notes = "部门监管行业修改")
@PostMapping("unitInClassChange")
@ResponseBody
public SingleResult<String> unitInClassChange(@Valid UnitInClassChangeDto unitInClassChangeDto)throws Exception{
SingleResult<String> result = new SingleResult<>();
//先删除所有行业监管信息
sysUnitTradeMapper.delByUnitId(unitInClassChangeDto.getUnitId());
if(StringUtils.isNotBlank(unitInClassChangeDto.getInClassIds())){
String[] strs = unitInClassChangeDto.getInClassIds().split(",");
for (String str : strs){
SysUnitTrade unitTrade = new SysUnitTrade();
unitTrade.setUnitId(unitInClassChangeDto.getUnitId());
unitTrade.setUnitTradeId(RandomNumber.getUUid());
unitTrade.setInClassId(str);
unitTrade.setCreateBy(getUserId());
unitTrade.setCreateTime(new Date());
sysUnitTradeMapper.insert(unitTrade);
}
}
return result;
}
}

55
inventory-gov/src/main/java/com/rzyc/service/TaskService.java
View File

@ -46,6 +46,8 @@ public class TaskService extends BaseController {
addTaskWarn();
//下级未履行上级任务预警
addSubordinateTaskWarn();
//企业清单未落实预警
addEntTask();
}catch (Exception e){
e.printStackTrace();
}
@ -382,4 +384,57 @@ public class TaskService extends BaseController {
}
}
/**
* 企业清单未落实预警
* @version v1.0
* @author dong
* @date 2023/3/31 14:13
*/
public void addEntTask()throws Exception{
List<EntPostTask> postTasks = entPostTaskMapper.notCompleteTask();
if(null != postTasks && postTasks.size() > 0){
for(EntPostTask postTask : postTasks){
//查询是否预警
Integer warnNum = sysWarningMapper.countByTargetId(postTask.getTaskId(),WarnTypeEnum.NET_LIST.getType());
if(0 == warnNum){
//查询企业信息
SysEnterprise enterprise = sysEnterpriseMapper.selectByPrimaryKey(postTask.getEnterpriseId());
if(null != enterprise){
String warnInfo = enterprise.getEntname()+"的履职任务<"+postTask.getItemTitle()+">未按时完成";
SysWarning warning = new SysWarning();
warning.setWarningId(RandomNumber.getUUid());
warning.setTargetId(postTask.getTaskId());
warning.setWarningInfo(warnInfo);
warning.setWarningTime(new Date());
warning.setTypeId(WarnTypeEnum.NET_LIST.getType());
warning.setDelState(DelState.NOT_DEL.getState());
warning.setCreateTime(new Date());
warning.setModifyTime(new Date());
sysWarningMapper.insert(warning);
//接收预警用户列表
List<SysUser> sysUsers = sysUserMapper.inClassUser(enterprise.getWorkClassId());
if(null != sysUsers && sysUsers.size() > 0){
for (SysUser sysUser : sysUsers){
SysWarningUser warningUser = new SysWarningUser();
warningUser.setWarningUserId(RandomNumber.getUUid());
warningUser.setWarningId(warning.getWarningId());
warningUser.setUserId(sysUser.getSysuserid());
warningUser.setTypeId(WarnTypeEnum.NET_LIST.getType());
warningUser.setState(1);
warningUser.setDelState(DelState.NOT_DEL.getState());
warningUser.setCreateTime(new Date());
warningUser.setModifyTime(new Date());
sysWarningUserMapper.insert(warningUser);
}
}
}
}
}
}
}
}