diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java index 56d8d69d..acddd119 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.standardinterpret.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; @@ -12,6 +13,7 @@ import com.jero.modules.activiti.process.standardinterpret.dto.StandardInterpret import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClause; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClauseSublist; import com.jero.modules.activiti.process.standardinterpret.service.StandardInterpretFlowService; +import com.jero.modules.activiti.process.standardinterpret.vo.HomeNewestStandardInterpret; import com.jero.modules.activiti.process.standardinterpret.vo.StandardInterpretFlowVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -76,6 +78,20 @@ public class StandardInterpretFlowController { return Result.OK(standardInterpretFlowService.getClauseList(standardId, fileType)); } + /** + * 标准解读流程-首页-最新解读标准 + * @return 结果对象 + */ + @AutoLog(value = "标准解读流程-首页-最新解读标准", operateType = CommonConstant.OPERATE_TYPE_1) + @ApiOperation(value="标准解读流程-首页-最新解读标准", notes="标准解读流程-首页-最新解读标准") + @GetMapping(value = "/homeNewestStandardInterpret") + public Result> homeNewestStandardInterpret(@RequestParam(name="pageNo", defaultValue="1") + Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") + Integer pageSize) { + return Result.OK(standardInterpretFlowService.homeNewestStandardInterpret(pageNo, pageSize)); + } + /** * 标准解读流程-流程发起 * @param standardInterpretFlowDTO 标准解读流程对象 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretMapper.java index 6e0c9f5e..82d2c750 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretMapper.java @@ -2,8 +2,11 @@ package com.jero.modules.activiti.process.standardinterpret.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret; +import com.jero.modules.activiti.process.standardinterpret.vo.HomeNewestStandardInterpret; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -22,5 +25,11 @@ public interface ProcessStandardInterpretMapper extends BaseMapper queryWrapper); + + /** + * 最新标准解读 + * @return + */ + IPage homeNewestStandardInterpret(Page page); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretMapper.xml index 41a38bcc..52fa7ef6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretMapper.xml @@ -31,5 +31,24 @@ left join laws_domestic_standard lds on psi.standard_id = lds.id and lds.del_flag = 0 ${ew.customSqlSegment} + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/StandardInterpretFlowService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/StandardInterpretFlowService.java index 300b1b38..96466472 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/StandardInterpretFlowService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/StandardInterpretFlowService.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.standardinterpret.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.system.vo.DictModel; import com.jero.modules.activiti.entity.ProcessAll; @@ -8,6 +9,7 @@ import com.jero.modules.activiti.process.standardinterpret.dto.StandardInterpret import com.jero.modules.activiti.process.standardinterpret.dto.StandardInterpretFlowDTO; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClause; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClauseSublist; +import com.jero.modules.activiti.process.standardinterpret.vo.HomeNewestStandardInterpret; import com.jero.modules.activiti.process.standardinterpret.vo.StandardInterpretFlowVO; import org.activiti.engine.delegate.DelegateTask; import org.springframework.web.servlet.ModelAndView; @@ -123,4 +125,9 @@ public interface StandardInterpretFlowService { * @param projectId */ void flowCountersign(String taskId, String userId, String projectId); + + /** + * 首页-最新解读标准 + */ + IPage homeNewestStandardInterpret(Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index a2633c00..b2bc5ff9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -6,6 +6,8 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.CommonConstant; @@ -29,12 +31,14 @@ import com.jero.modules.activiti.process.standardinterpret.dto.StandardInterpret import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClause; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClauseSublist; +import com.jero.modules.activiti.process.standardinterpret.mapper.ProcessStandardInterpretMapper; import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretClauseService; import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretClauseSublistService; import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService; import com.jero.modules.activiti.process.standardinterpret.service.StandardInterpretFlowService; import com.jero.modules.activiti.process.standardinterpret.vo.FlowApproveInfo; import com.jero.modules.activiti.process.standardinterpret.vo.FlowImportExcel; +import com.jero.modules.activiti.process.standardinterpret.vo.HomeNewestStandardInterpret; import com.jero.modules.activiti.process.standardinterpret.vo.StandardInterpretFlowVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; @@ -61,7 +65,6 @@ import com.jero.modules.system.service.ISysDictService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.ManagementService; -import org.activiti.engine.RepositoryService; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateTask; @@ -109,7 +112,6 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe private final RuntimeService runtimeService; private final TaskService taskService; private final ProcessAllService processAllService; - private final RepositoryService repositoryService; private final ProcessApprovalRecordService processApprovalRecordService; private final ProcessNodeLinkService processNodeLinkService; private final ProcessStandardInterpretService processStandardInterpretService; @@ -128,6 +130,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe private final IDocumentSplitService documentSplitService; private final ManagementService managementService; private final ILawsStandardMasterPlanService lawsStandardMasterPlanService; + private final ProcessStandardInterpretMapper processStandardInterpretMapper; private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); private final List tempList = new ArrayList<>(); @@ -894,6 +897,11 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe } } + @Override + public IPage homeNewestStandardInterpret(Integer pageNo, Integer pageSize) { + return processStandardInterpretMapper.homeNewestStandardInterpret(new Page(pageNo, pageSize)); + } + private List sixthVerify(ProcessStandardInterpretClauseSublist data) { List errorList = new ArrayList<>(); String enterpriseStandard = data.getEnterpriseStandard(); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java new file mode 100644 index 00000000..a214ed8a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java @@ -0,0 +1,49 @@ +package com.jero.modules.activiti.process.standardinterpret.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @ClassName: HomeNewestStandardInterpret + * @Description: + * @Author: yjz + * @Date: 2024-07-19 15:58 + * @Version: 1.0 + **/ +@Data +public class HomeNewestStandardInterpret { + // id + @ApiModelProperty(value = "id") + private String id; + // 标准id + @ApiModelProperty(value = "标准id") + private String standardId; + // 标准名称 + @ApiModelProperty(value = "标准名称") + private String standardName; + // 标准状态 + @ApiModelProperty(value = "标准状态") + @Dict(dicCode = "standard_state") + private String standardState; + // 发布日期 + @ApiModelProperty(value = "发布日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date createTime; + // 实施日期 + @ApiModelProperty(value = "实施日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date implementationDate; + // 代替标准编号 + @ApiModelProperty(value = "代替标准编号") + private String substituteStandardNumber; + // 拆分info_id + @ApiModelProperty(value = "拆分info_id") + private String splitInfoId; +}