feat: 企标复审相关基础代码

This commit is contained in:
2024-09-09 17:42:15 +08:00
parent ba9a30638f
commit aace29fd2f
12 changed files with 167 additions and 298 deletions
@@ -36,7 +36,6 @@ import com.jero.modules.activiti.vo.ResolveTaskParam;
import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon;
import com.jero.modules.laws.common.util.CurrentUserUtil;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService;
import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.HistoryService;
import org.activiti.engine.ManagementService;
@@ -79,8 +78,6 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
@Resource
private EnterpriseStandardPlanService espService;
@Resource
private EnterpriseStandardRecheckPlanService esRecheckService;
@Resource
private PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI;
@Resource
private ProcessApprovalRecordService processApprovalRecordService;
@@ -0,0 +1,57 @@
package com.jero.modules.laws.enterprise.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.laws.enterprise.entity.LawsEnterpriseStandardRecheck;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
import com.jero.modules.laws.enterprise.service.ILawsEnterpriseStandardRecheckService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @Description: 企标复审计划
* @Author: jero-boot
* @Date: 2022-02-12
* @Version: V1.0
*/
@ApiSupport(order = 506)
@Api(tags="企标复审")
@RestController
@RequestMapping("/enterprise/recheck")
@Slf4j
public class EnterpriseStandardRecheckController extends JeroController<LawsEnterpriseStandardRecheck, ILawsEnterpriseStandardRecheckService> {
@Resource
private ILawsEnterpriseStandardRecheckService recheckService;
/**
* 分页列表查询
*
* @return
*/
@RequiresPermissions("enterpriseStandardLibrary:recheckPlan:search")
@AutoLog(value = "企标复审计划-分页列表查询")
@ApiOperationSupport(order = 1)
@ApiOperation(value="企标复审计划-分页列表查询", notes="企标复审计划-分页列表查询")
@GetMapping(value = "/page")
public Result<IPage<LawsEnterpriseStandardRecheck>> queryPageList(ESQueryCommonDTO esDeclare,
@RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) {
return Result.OK(recheckService.queryPageList(esDeclare, pageNo, pageSize));
}
}
@@ -1,67 +0,0 @@
package com.jero.modules.laws.enterprise.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* @Description: 企标复审计划
* @Author: jero-boot
* @Date: 2022-02-12
* @Version: V1.0
*/
@ApiSupport(order = 506)
@Api(tags="企标复审计划")
@RestController
@RequestMapping("/enterprise/recheckPlan")
@Slf4j
public class EnterpriseStandardRecheckPlanController extends JeroController<EnterpriseStandardRecheckPlan, EnterpriseStandardRecheckPlanService> {
@Resource
private EnterpriseStandardRecheckPlanService recheckPlanService;
/**
* 分页列表查询
*
* @return
*/
@RequiresPermissions("enterpriseStandardLibrary:recheckPlan:search")
@AutoLog(value = "企标复审计划-分页列表查询")
@ApiOperationSupport(order = 1)
@ApiOperation(value="企标复审计划-分页列表查询", notes="企标复审计划-分页列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(ESQueryCommonDTO esDeclare,
@RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) {
return Result.OK(recheckPlanService.queryPageList(esDeclare, pageNo, pageSize));
}
/**
* 根据Id查询
*
* @return
*/
@AutoLog(value = "企标复审计划-根据Id查询")
@ApiOperationSupport(order = 2)
@ApiOperation(value="企标复审计划-根据Id查询", notes="企标复审计划-根据Id查询")
@GetMapping(value = "/getById/{id}")
@Translation
public Result<?> getDataById(@PathVariable("id") @ApiParam("复审计划主键ID") String id) {
return Result.OK(recheckPlanService.getDataById(id));
}
}
@@ -1,34 +1,25 @@
package com.jero.modules.laws.enterprise.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 企业标准复审计划
* @Author: jero-boot
* @Date: 2023-09-06
* @Version: V1.0
* 企标复审计划
* @TableName laws_enterprise_standard_recheck
*/
@TableName(value ="laws_enterprise_standard_recheck")
@Data
@TableName("laws_enterprise_standard_recheck_plan")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="laws_enterprise_standard_recheck_plan对象", description="企业标准复审计划")
public class EnterpriseStandardRecheckPlan implements Serializable {
private static final long serialVersionUID = 2431978123467926781L;
public class LawsEnterpriseStandardRecheck implements Serializable {
/**主键ID*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键ID")
@@ -58,25 +49,29 @@ public class EnterpriseStandardRecheckPlan implements Serializable {
@ApiModelProperty(value = "所属部门")
private String orgCode;
/**企标Id*/
@ApiModelProperty(value = "企标Id")
private String standardId;
/**企标编号*/
@ApiModelProperty(value = "企标编号")
private String standardNo;
/**发布日期*/
/**复审日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "发布日期")
@ApiModelProperty(value = "复审日期")
private Date recheckDate;
/**复审结果*/
/**
* 复审结果
*/
@ApiModelProperty(value = "复审结果")
@Dict(dicCode = "recheck_result")
private String recheckResult;
/**是否在流程中 0不在 1在*/
@ApiModelProperty(value = "是否在流程中 0不在 1在")
private String inProcessFlag;
}
/**
* 备注
*/
private String remark;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
@@ -1,31 +0,0 @@
package com.jero.modules.laws.enterprise.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author ThinkBook
* @description 针对表【laws_enterprise_standard_recheck_plan】的数据库操作Mapper
* @createDate 2023-09-07 11:20:18
* @Entity generator.entity.EnterpriseStandardRecheckPlan
*/
public interface EnterpriseStandardRecheckPlanMapper extends BaseMapper<EnterpriseStandardRecheckPlan> {
/**
* 复审列表
* @param page
* @param esRecheckPlan
* @return
*/
IPage<EnterpriseStandardRecheckPlanVo> page(IPage<EnterpriseStandardRecheckPlanVo> page, @Param("param") ESQueryCommonDTO esRecheckPlan);
}
@@ -0,0 +1,18 @@
package com.jero.modules.laws.enterprise.mapper;
import com.jero.modules.laws.enterprise.entity.LawsEnterpriseStandardRecheck;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author ThinkBook
* @description 针对表【laws_enterprise_standard_recheck(企标复审计划)】的数据库操作Mapper
* @createDate 2024-09-09 17:35:23
* @Entity com.jero.modules.laws.enterprise.entity.LawsEnterpriseStandardRecheck
*/
public interface LawsEnterpriseStandardRecheckMapper extends BaseMapper<LawsEnterpriseStandardRecheck> {
}
@@ -1,85 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.laws.enterprise.mapper.EnterpriseStandardRecheckPlanMapper">
<resultMap id="BaseResultMap" type="com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan">
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
<result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
<result property="standardId" column="standard_id" jdbcType="VARCHAR"/>
<result property="recheckDate" column="recheck_date" jdbcType="TIMESTAMP"/>
<result property="recheckResult" column="recheck_result" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,create_by,create_time,
update_by,update_time,org_code,
standard_no,recheck_date,recheck_result
</sql>
<select id="page" resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo">
SELECT
p.id,
p.create_time,
s.id AS standardId,
s.standard_number AS standardNo,
s.standard_name AS standardName,
s.release_date AS releaseDate,
p.recheck_date AS recheckDate,
p.recheck_result AS recheckResult,
s.main_drafting_user AS mainDraftingUser,
s.main_drafting_unit AS mainDraftingUnit,
s.implementation_date AS implementationDate
FROM
laws_enterprise_standard_recheck_plan AS p
LEFT JOIN laws_enterprise_standard AS s ON s.id = p.standard_id
LEFT JOIN sys_user AS u ON u.id = s.main_drafting_user
LEFT JOIN sys_depart AS d ON d.id = s.main_drafting_unit
WHERE 1 = 1
<!--企标编号判断-->
<if test="param.standardNo != null and param.standardNo != ''">
AND s.standard_number LIKE CONCAT('%',#{param.standardNo},'%')
</if>
<!--企标名称判断-->
<if test="param.standardName != null and param.standardName != ''">
AND s.standard_name LIKE CONCAT('%',#{param.standardName},'%')
</if>
<!--发布日期判断-->
<if test="param.releaseStartDate != null and param.releaseEndDate != null">
AND s.release_date BETWEEN #{param.releaseStartDate} AND #{param.releaseEndDate}
</if>
<!--复审日期判断-->
<if test="param.recheckStartDate != null and param.recheckEndDate != null">
AND p.recheck_date BETWEEN #{param.recheckStartDate} AND #{param.recheckEndDate}
</if>
<if test="param.idList != null and param.idList.size() > 0">
AND p.id IN
<foreach item="item" index="index" collection="param.idList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!--主起草人-->
<if test="param.mainDraftingUser != null and param.mainDraftingUser != ''">
AND CONCAT(u.realname, '(', u.username, ')') LIKE CONCAT('%',#{param.mainDraftingUser},'%')
</if>
<!--主起草单位-->
<if test="param.mainDraftingUnit != null and param.mainDraftingUnit != ''">
AND s.main_drafting_unit = #{param.mainDraftingUnit}
</if>
<!--复审结果-->
<if test="param.recheckResultList != null and param.recheckResultList.size() > 0">
AND p.recheck_result IN
<foreach item="item" index="index" collection="param.recheckResultList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
ORDER BY
p.create_time DESC
</select>
</mapper>
@@ -1,27 +0,0 @@
package com.jero.modules.laws.enterprise.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo;
/**
* @author ThinkBook
* @description 针对表【laws_enterprise_standard_recheck_plan】的数据库操作Service
* @createDate 2023-09-07 11:20:19
*/
public interface EnterpriseStandardRecheckPlanService extends IService<EnterpriseStandardRecheckPlan> {
/**
* 企标复审计划-分页列表查询
* @param esRecheckPlan
* @param pageNo
* @param pageSize
* @return
*/
IPage<EnterpriseStandardRecheckPlanVo> queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize);
EnterpriseStandardRecheckPlanVo getDataById(String id);
}
@@ -0,0 +1,16 @@
package com.jero.modules.laws.enterprise.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.laws.enterprise.entity.LawsEnterpriseStandardRecheck;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
/**
* @author ThinkBook
* @description 针对表【laws_enterprise_standard_recheck(企标复审计划)】的数据库操作Service
* @createDate 2024-09-09 17:35:23
*/
public interface ILawsEnterpriseStandardRecheckService extends IService<LawsEnterpriseStandardRecheck> {
IPage<LawsEnterpriseStandardRecheck> queryPageList(ESQueryCommonDTO esDeclare, Integer pageNo, Integer pageSize);
}
@@ -1,59 +0,0 @@
package com.jero.modules.laws.enterprise.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.DictModel;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService;
import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardRecheckPlanMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author ThinkBook
* @description 针对表【laws_enterprise_standard_recheck_plan】的数据库操作Service实现
* @createDate 2023-09-07 11:20:19
*/
@Service
@Transactional(rollbackFor = JeroBootException.class)
@Slf4j
public class EnterpriseStandardRecheckPlanServiceImpl extends ServiceImpl<EnterpriseStandardRecheckPlanMapper, EnterpriseStandardRecheckPlan>
implements EnterpriseStandardRecheckPlanService {
@Resource
private EnterpriseStandardRecheckPlanMapper esRecheckPlanMapper;
@Override
public IPage<EnterpriseStandardRecheckPlanVo> queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize) {
IPage<EnterpriseStandardRecheckPlanVo> page = new Page<>(pageNo, pageSize);
return esRecheckPlanMapper.page(page, esRecheckPlan);
}
@Override
public EnterpriseStandardRecheckPlanVo getDataById(String id) {
List<String> idList = new ArrayList<>(Collections.singletonList(id));
ESQueryCommonDTO esQueryCommonDTO = new ESQueryCommonDTO();
esQueryCommonDTO.setIdList(idList);
List<EnterpriseStandardRecheckPlanVo> records = this.queryPageList(esQueryCommonDTO, 1, Integer.MAX_VALUE).getRecords();
if (!records.isEmpty()) {
return records.get(0);
}
return null;
}
}
@@ -0,0 +1,28 @@
package com.jero.modules.laws.enterprise.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.laws.enterprise.entity.LawsEnterpriseStandardRecheck;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
import com.jero.modules.laws.enterprise.service.ILawsEnterpriseStandardRecheckService;
import com.jero.modules.laws.enterprise.mapper.LawsEnterpriseStandardRecheckMapper;
import org.springframework.stereotype.Service;
/**
* @author ThinkBook
* @description 针对表【laws_enterprise_standard_recheck(企标复审计划)】的数据库操作Service实现
* @createDate 2024-09-09 17:35:23
*/
@Service
public class LawsEnterpriseStandardRecheckServiceImpl extends ServiceImpl<LawsEnterpriseStandardRecheckMapper, LawsEnterpriseStandardRecheck>
implements ILawsEnterpriseStandardRecheckService {
@Override
public IPage<LawsEnterpriseStandardRecheck> queryPageList(ESQueryCommonDTO esDeclare, Integer pageNo, Integer pageSize) {
return null;
}
}
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.laws.enterprise.mapper.LawsEnterpriseStandardRecheckMapper">
<resultMap id="BaseResultMap" type="com.jero.modules.laws.enterprise.entity.LawsEnterpriseStandardRecheck">
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
<result property="standardId" column="standard_id" jdbcType="VARCHAR"/>
<result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
<result property="recheckDate" column="recheck_date" jdbcType="TIMESTAMP"/>
<result property="recheckResult" column="recheck_result" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,create_by,create_time,
update_by,update_time,org_code,
standard_id,standard_no,recheck_date,
recheck_result,remark
</sql>
</mapper>