diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index 268eb995..4f5dae9f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -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 @Resource private EnterpriseStandardPlanService espService; @Resource - private EnterpriseStandardRecheckPlanService esRecheckService; - @Resource private PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI; @Resource private ProcessApprovalRecordService processApprovalRecordService; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckController.java new file mode 100644 index 00000000..6fcdac1c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckController.java @@ -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 { + + @Resource + private ILawsEnterpriseStandardRecheckService recheckService; + + /** + * 分页列表查询 + * + * @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(recheckService.queryPageList(esDeclare, pageNo, pageSize)); + } + +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java deleted file mode 100644 index adc0c77a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java +++ /dev/null @@ -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 { - - @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)); - } -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRecheckPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/LawsEnterpriseStandardRecheck.java similarity index 64% rename from laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRecheckPlan.java rename to laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/LawsEnterpriseStandardRecheck.java index f3c0481b..0c3b5398 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRecheckPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/LawsEnterpriseStandardRecheck.java @@ -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; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardRecheckPlanMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardRecheckPlanMapper.java deleted file mode 100644 index 47477702..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardRecheckPlanMapper.java +++ /dev/null @@ -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 { - - /** - * 复审列表 - * @param page - * @param esRecheckPlan - * @return - */ - IPage page(IPage page, @Param("param") ESQueryCommonDTO esRecheckPlan); -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/LawsEnterpriseStandardRecheckMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/LawsEnterpriseStandardRecheckMapper.java new file mode 100644 index 00000000..748e692c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/LawsEnterpriseStandardRecheckMapper.java @@ -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 { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml deleted file mode 100644 index 9fe9645a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - id,create_by,create_time, - update_by,update_time,org_code, - standard_no,recheck_date,recheck_result - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRecheckPlanService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRecheckPlanService.java deleted file mode 100644 index 318938d8..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRecheckPlanService.java +++ /dev/null @@ -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 { - - /** - * 企标复审计划-分页列表查询 - * @param esRecheckPlan - * @param pageNo - * @param pageSize - * @return - */ - IPage queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize); - - EnterpriseStandardRecheckPlanVo getDataById(String id); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/ILawsEnterpriseStandardRecheckService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/ILawsEnterpriseStandardRecheckService.java new file mode 100644 index 00000000..33180293 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/ILawsEnterpriseStandardRecheckService.java @@ -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 { + + IPage queryPageList(ESQueryCommonDTO esDeclare, Integer pageNo, Integer pageSize); +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java deleted file mode 100644 index ea413a72..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java +++ /dev/null @@ -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 - implements EnterpriseStandardRecheckPlanService { - - @Resource - private EnterpriseStandardRecheckPlanMapper esRecheckPlanMapper; - - @Override - public IPage queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize) { - IPage page = new Page<>(pageNo, pageSize); - return esRecheckPlanMapper.page(page, esRecheckPlan); - } - - @Override - public EnterpriseStandardRecheckPlanVo getDataById(String id) { - List idList = new ArrayList<>(Collections.singletonList(id)); - ESQueryCommonDTO esQueryCommonDTO = new ESQueryCommonDTO(); - esQueryCommonDTO.setIdList(idList); - List records = this.queryPageList(esQueryCommonDTO, 1, Integer.MAX_VALUE).getRecords(); - if (!records.isEmpty()) { - return records.get(0); - } - return null; - } -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/LawsEnterpriseStandardRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/LawsEnterpriseStandardRecheckServiceImpl.java new file mode 100644 index 00000000..49e9b146 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/LawsEnterpriseStandardRecheckServiceImpl.java @@ -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 + implements ILawsEnterpriseStandardRecheckService { + + @Override + public IPage queryPageList(ESQueryCommonDTO esDeclare, Integer pageNo, Integer pageSize) { + return null; + } +} + + + + diff --git a/laws-modules/src/main/resources/mapper/LawsEnterpriseStandardRecheckMapper.xml b/laws-modules/src/main/resources/mapper/LawsEnterpriseStandardRecheckMapper.xml new file mode 100644 index 00000000..b0be6336 --- /dev/null +++ b/laws-modules/src/main/resources/mapper/LawsEnterpriseStandardRecheckMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + id,create_by,create_time, + update_by,update_time,org_code, + standard_id,standard_no,recheck_date, + recheck_result,remark + +