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 new file mode 100644 index 00000000..27ffe9ec --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java @@ -0,0 +1,54 @@ +package com.jero.modules.laws.enterprise.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +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.EnterpriseStandardDeclare; +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.service.EnterpriseStandardDeclareService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +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 + */ +@Api(tags="企标复审计划") +@RestController +@RequestMapping("/enterprise/recheckPlan") +@Slf4j +public class EnterpriseStandardRecheckPlanController extends JeroController { + + @Resource + private EnterpriseStandardRecheckPlanService recheckPlanService; + + /** + * 分页列表查询 + * + * @return + */ + @AutoLog(value = "企标复审计划-分页列表查询") + @ApiOperation(value="企标复审计划-分页列表查询", notes="企标复审计划-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ESQueryCommonDTO esDeclare, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + IPage pageList= recheckPlanService.queryPageList(esDeclare, pageNo, pageSize); + return Result.OK(pageList); + } +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java new file mode 100644 index 00000000..372a20e7 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java @@ -0,0 +1,57 @@ +package com.jero.modules.laws.enterprise.entity.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author: Mzaxd + * @Date: 2023/9/10 15:24 + */ + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EnterpriseStandardRecheckPlanVo { + + /**主键ID*/ + @ApiModelProperty(value = "主键ID") + private String id; + + /**企标编号*/ + @ApiModelProperty(value = "企标编号") + private String standardNo; + + /**企标名称*/ + @ApiModelProperty(value = "企标名称") + private String standardName; + + /**发布日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "发布日期") + private Date releaseDate; + + /**复审日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "复审日期") + private Date recheckDate; + + /**复审结果*/ + @ApiModelProperty(value = "复审结果") + private String recheckResult; + + /**主起草人*/ + @ApiModelProperty(value = "主起草人") + private String mainDraftingUser; + + /**主起草单位*/ + @ApiModelProperty(value = "主起草单位") + private String mainDraftingUnit; +} 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 index f3ae3b83..47477702 100644 --- 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 @@ -1,7 +1,13 @@ 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 @@ -11,6 +17,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ 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/xml/EnterpriseStandardRecheckPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml index 310d7dd1..45c08cac 100644 --- 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 @@ -21,4 +21,43 @@ 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 index f359388c..ea6ae038 100644 --- 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 @@ -1,7 +1,11 @@ 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 @@ -10,4 +14,12 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface EnterpriseStandardRecheckPlanService extends IService { + /** + * 企标复审计划-分页列表查询 + * @param esRecheckPlan + * @param pageNo + * @param pageSize + * @return + */ + IPage queryPageList(ESQueryCommonDTO esRecheckPlan, 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 index cdcf03f8..5f872bf5 100644 --- 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 @@ -1,11 +1,23 @@ 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.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 org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + /** * @author ThinkBook * @description 针对表【laws_enterprise_standard_recheck_plan】的数据库操作Service实现 @@ -15,6 +27,33 @@ import org.springframework.stereotype.Service; public class EnterpriseStandardRecheckPlanServiceImpl extends ServiceImpl implements EnterpriseStandardRecheckPlanService{ + @Resource + private ISysBaseAPI sysBaseAPI; + + @Resource + private EnterpriseStandardRecheckPlanMapper esRecheckPlanMapper; + + @Override + public IPage queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize) { + IPage page = new Page<>(pageNo, pageSize); + esRecheckPlanMapper.page(page, esRecheckPlan); + this.transRecheckPlanVo(page.getRecords()); + return page; + } + + // 转换列表中的状态值为中文 + private void transRecheckPlanVo(List list) { + if (list.isEmpty()) { + return; + } + List ynDictModelList = sysBaseAPI.getDictItems("en_laws_recheck_result"); + list.forEach(e -> { + List collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getRecheckResult())).collect(Collectors.toList()); + if (!collect.isEmpty()) { + e.setRecheckResult(collect.get(0).getText()); + } + }); + } }