diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java new file mode 100644 index 00000000..1a818a67 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.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.EnterpriseStandardReviewMeetingRecord; +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.EnterpriseStandardReviewMeetingVo; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService; +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/reviewMeeting") +@Slf4j +public class EnterpriseStandardReviewMeetingController extends JeroController { + + @Resource + private EnterpriseStandardReviewMeetingRecordService esReviewMeetingService; + + /** + * 分页列表查询 + * + * @return + */ + @AutoLog(value = "企标评审会-分页列表查询") + @ApiOperation(value="企标评审会-分页列表查询", notes="企标评审会-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ESQueryCommonDTO esReviewMeeting, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + IPage pageList= esReviewMeetingService.queryPageList(esReviewMeeting, pageNo, pageSize); + return Result.OK(pageList); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java index 74f1a97e..6d42582f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java @@ -58,6 +58,10 @@ public class EnterpriseStandardReviewMeetingRecord implements Serializable { @ApiModelProperty(value = "所属部门") private String orgCode; + /**企标Id*/ + @ApiModelProperty(value = "企标Id") + private String standardId; + /**企标编号*/ @ApiModelProperty(value = "企标编号") private String standardNo; @@ -68,10 +72,6 @@ public class EnterpriseStandardReviewMeetingRecord implements Serializable { @ApiModelProperty(value = "评审日期") private Date reviewDate; - /**平均总分*/ - @ApiModelProperty(value = "平均总分") - private String avgScore; - /**是否为优质标准*/ @ApiModelProperty(value = "是否为优质标准") private String qualityFlag; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRmrEvaluateDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRmrEvaluateDetail.java index fe5edf4a..330e01a3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRmrEvaluateDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRmrEvaluateDetail.java @@ -60,7 +60,7 @@ public class EnterpriseStandardRmrEvaluateDetail implements Serializable { /**企标编号*/ @ApiModelProperty(value = "企标编号") - private String standardNo; + private String reviewMeetingId; /**评分项目*/ @ApiModelProperty(value = "评分项目") @@ -70,6 +70,10 @@ public class EnterpriseStandardRmrEvaluateDetail implements Serializable { @ApiModelProperty(value = "评分分值") private String evaluateScore; + /**评分人id*/ + @ApiModelProperty(value = "评分人id") + private String adjudicatorId; + /**扣分理由*/ @ApiModelProperty(value = "扣分理由") private String deductionScoreReason; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java new file mode 100644 index 00000000..f422e613 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java @@ -0,0 +1,53 @@ +package com.jero.modules.laws.enterprise.entity.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author: Mzaxd + * @Date: 2023/9/7 16:38 + */ +@Data +public class EnterpriseStandardReviewMeetingVo { + + /**主键ID*/ + @ApiModelProperty(value = "主键ID") + private String id; + + /**企标编号*/ + @ApiModelProperty(value = "企标编号-对应计划的新企标编号") + private String standardNo; + + /**企标编号*/ + @ApiModelProperty(value = "企标编号") + private String standardName; + + @ApiModelProperty(value = "主起草人") + private String mainDraftingUser; + + @ApiModelProperty(value = "主起草单位") + private String mainDraftingUnit; + + /**评审日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "评审日期") + private Date reviewDate; + + @ApiModelProperty(value = "评审人") + private String reviewUsers; + + @ApiModelProperty(value = "评审人") + private String avgScore; + + /**是否为优质标准*/ + @ApiModelProperty(value = "是否为优质标准") + private String qualityFlag; + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardReviewMeetingRecordMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardReviewMeetingRecordMapper.java index 731ea330..e959a29f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardReviewMeetingRecordMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardReviewMeetingRecordMapper.java @@ -1,7 +1,11 @@ package com.jero.modules.laws.enterprise.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo; +import org.apache.ibatis.annotations.Param; /** * @author ThinkBook @@ -11,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface EnterpriseStandardReviewMeetingRecordMapper extends BaseMapper { + IPage page(IPage page, @Param("param") ESQueryCommonDTO esReviewMeeting); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml index d623ffdd..46cf4b48 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml @@ -13,14 +13,73 @@ - - - id,create_by,create_time, - update_by,update_time,org_code, - standard_no,review_date,avg_score, - quality_flag - + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java index c4dcd403..975393f6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java @@ -1,7 +1,10 @@ package com.jero.modules.laws.enterprise.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo; /** * @author ThinkBook @@ -10,4 +13,12 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface EnterpriseStandardReviewMeetingRecordService extends IService { + /** + * 列表接口 + * @param esReviewMeeting + * @param pageNo + * @param pageSize + * @return + */ + IPage queryPageList(ESQueryCommonDTO esReviewMeeting, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java index 92fcc30e..f2174a33 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java @@ -1,11 +1,22 @@ 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.EnterpriseStandardReviewMeetingRecord; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo; import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardReviewMeetingRecordMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + /** * @author ThinkBook * @description 针对表【laws_enterprise_standard_review_meeting_record】的数据库操作Service实现 @@ -15,6 +26,33 @@ import org.springframework.stereotype.Service; public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImpl implements EnterpriseStandardReviewMeetingRecordService { + @Resource + private ISysBaseAPI sysBaseAPI; + + @Resource + private EnterpriseStandardReviewMeetingRecordMapper esReviewMeetingMapper; + + @Override + public IPage queryPageList(ESQueryCommonDTO esReviewMeeting, Integer pageNo, Integer pageSize) { + IPage page = new Page<>(pageNo, pageSize); + esReviewMeetingMapper.page(page, esReviewMeeting); + this.transReviewMeetingVo(page.getRecords()); + return page; + } + + // 转换列表中的状态值为中文 + private void transReviewMeetingVo(List list) { + if (list.isEmpty()) { + return; + } + List ynDictModelList = sysBaseAPI.getDictItems("yn"); + list.forEach(e -> { + List collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getQualityFlag())).collect(Collectors.toList()); + if (!collect.isEmpty()) { + e.setQualityFlag(collect.get(0).getText()); + } + }); + } } diff --git a/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/EnterpriseStandardTest.java b/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/EnterpriseStandardTest.java index 873cfd73..a38b76d1 100644 --- a/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/EnterpriseStandardTest.java +++ b/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/EnterpriseStandardTest.java @@ -3,6 +3,10 @@ package com.jero.modules.standard.enterprise; import com.github.javafaker.Faker; import com.jero.JeroSystemSingleApplication; import com.jero.modules.laws.enterprise.entity.EnterpriseStandard; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardRmrEvaluateDetailService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardService; import jdk.nashorn.internal.ir.annotations.Reference; import org.junit.Test; @@ -27,6 +31,12 @@ public class EnterpriseStandardTest { @Resource private EnterpriseStandardService enterpriseStandardService; + @Resource + private EnterpriseStandardRmrEvaluateDetailService enterpriseStandardRmrEvaluateDetailService; + + @Resource + private EnterpriseStandardPlanService enterpriseStandardPlanService; + private static final Faker faker = new Faker(); private static final Random random = new Random(); @@ -61,11 +71,45 @@ public class EnterpriseStandardTest { return enterpriseStandard; } + + public static EnterpriseStandardPlan generateRandomEnterpriseStandardPlan() { + EnterpriseStandardPlan enterpriseStandardPlan = new EnterpriseStandardPlan(); + + enterpriseStandardPlan.setDelFlag(faker.bool().bool() ? 1 : 0); + enterpriseStandardPlan.setMainDraftingUser(faker.name().fullName()); + enterpriseStandardPlan.setMainDraftingUnit(faker.company().name()); + enterpriseStandardPlan.setMainDraftingUnitResponsiblePerson(faker.name().fullName()); + + + // ... continue with more fields as needed + + enterpriseStandardPlan.setReleaseDate(faker.date().past(1, TimeUnit.SECONDS)); + + return enterpriseStandardPlan; + } @Test public void insertRandomES() { EnterpriseStandard randomData = generateRandomEnterpriseStandard(); enterpriseStandardService.save(randomData); System.out.println(randomData); } - + + @Test + public void insertRandomESRmrDetail() { + for (int i = 0; i < 6; i++) { + EnterpriseStandardRmrEvaluateDetail random = new EnterpriseStandardRmrEvaluateDetail(); + random.setEvaluateItem(String.valueOf(i + 1)); + random.setDeductionScoreReason("无"); + enterpriseStandardRmrEvaluateDetailService.save(random); + } + } + + @Test + public void insertRandomESP() { + for (int i = 0; i < 1; i++) { + EnterpriseStandardPlan random = generateRandomEnterpriseStandardPlan(); + enterpriseStandardPlanService.save(random); + } + } + }