diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java new file mode 100644 index 00000000..04df6eb9 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java @@ -0,0 +1,48 @@ +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.vo.EnterpriseStandardDeclareVo; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + + +/** + * @Description: 企标宣贯 + * @Author: jero-boot + * @Date: 2022-02-12 + * @Version: V1.0 + */ +@Api(tags="企标宣贯") +@RestController +@RequestMapping("/enterprise/declare") +@Slf4j +public class EnterpriseStandardDeclareController extends JeroController { + + @Resource + private EnterpriseStandardDeclareService esDeclareService; + + /** + * 分页列表查询 + * + * @return + */ + @AutoLog(value = "企标宣贯-分页列表查询") + @ApiOperation(value="企标宣贯-分页列表查询", notes="企标宣贯-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(EnterpriseStandardDeclare esDeclare, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + IPage pageList= esDeclareService.queryPageList(esDeclare, pageNo, pageSize); + return Result.OK(pageList); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java index d69d0cee..a29d1dfc 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java @@ -69,7 +69,7 @@ public class EnterpriseStandardDeclare implements Serializable { private Date declareDate; /** 宣贯人 */ - @ApiModelProperty(value = "宣贯人") + @ApiModelProperty(value = "宣贯人id") private String declareUser; /** 主题 */ @@ -83,4 +83,25 @@ public class EnterpriseStandardDeclare implements Serializable { /** 内容 */ @ApiModelProperty(value = "内容") private String declareContent; + + @TableField(exist = false) + @ApiModelProperty(value = "企标名称") + private String standardName; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "宣贯开始日期") + private Date declareStartDate; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "宣贯结束日期") + private Date declareEndDate; + + @TableField(exist = false) + @ApiModelProperty(value = "宣贯人姓名") + private String declareUserName; + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardDeclareVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardDeclareVo.java new file mode 100644 index 00000000..f41587d8 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardDeclareVo.java @@ -0,0 +1,50 @@ +package com.jero.modules.laws.enterprise.entity.vo; + +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 14:53 + */ + +@Data +public class EnterpriseStandardDeclareVo { + + @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 implementationDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "宣贯日期") + private Date declareDate; + + @ApiModelProperty(value = "宣贯人id") + private String declareUser; + + @ApiModelProperty(value = "宣贯人姓名") + private String declareUserName; + + @ApiModelProperty(value = "相关材料id") + private String declareFile; + + @ApiModelProperty(value = "相关材料文件名") + private String declareFileName; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java index ea2589c3..26146e04 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardDeclareMapper.java @@ -1,7 +1,10 @@ package com.jero.modules.laws.enterprise.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; +import org.apache.ibatis.annotations.Param; /** * @author ThinkBook @@ -11,6 +14,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface EnterpriseStandardDeclareMapper extends BaseMapper { + /** + * 宣贯列表 + * @param page + * @param esDeclare + * @return + */ + IPage page(IPage page, @Param("param") EnterpriseStandardDeclare esDeclare); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml index 91f944a2..0e159893 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml @@ -25,4 +25,43 @@ standard_no,declare_date,declare_user, declare_topic,declare_file,declare_content + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.java index eab1d3c6..41efb7a0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardDeclareService.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.EnterpriseStandardDeclare; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; + +import javax.servlet.http.HttpServletRequest; /** * @author ThinkBook @@ -10,4 +14,12 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface EnterpriseStandardDeclareService extends IService { + /** + * 企标宣贯列表 + * @param esDeclare + * @param pageNo + * @param pageSize + * @return + */ + IPage queryPageList(EnterpriseStandardDeclare esDeclare, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java index dbd88807..90ef683e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java @@ -1,11 +1,17 @@ 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.modules.laws.enterprise.entity.EnterpriseStandardDeclare; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardDeclareMapper; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + /** * @author ThinkBook * @description 针对表【laws_enterprise_standard_declare】的数据库操作Service实现 @@ -15,6 +21,14 @@ import org.springframework.stereotype.Service; public class EnterpriseStandardDeclareServiceImpl extends ServiceImpl implements EnterpriseStandardDeclareService{ + @Resource + private EnterpriseStandardDeclareMapper esDeclareMapper; + + @Override + public IPage queryPageList(EnterpriseStandardDeclare esDeclare, Integer pageNo, Integer pageSize) { + IPage page = new Page<>(pageNo, pageSize); + return esDeclareMapper.page(page, esDeclare); + } } diff --git a/laws-single-startup/pom.xml b/laws-single-startup/pom.xml index 4a39c938..2ffad7b0 100644 --- a/laws-single-startup/pom.xml +++ b/laws-single-startup/pom.xml @@ -62,6 +62,18 @@ p6spy p6spy + + + org.yaml + snakeyaml + 1.26 + + + com.github.javafaker + javafaker + 1.0.2 + test + 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 new file mode 100644 index 00000000..873cfd73 --- /dev/null +++ b/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/EnterpriseStandardTest.java @@ -0,0 +1,71 @@ +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.service.EnterpriseStandardService; +import jdk.nashorn.internal.ir.annotations.Reference; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.Random; +import java.util.concurrent.TimeUnit; + +/** + * @author: Mzaxd + * @Date: 2023/9/7 15:36 + */ + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeroSystemSingleApplication.class) +public class EnterpriseStandardTest { + + @Resource + private EnterpriseStandardService enterpriseStandardService; + + private static final Faker faker = new Faker(); + private static final Random random = new Random(); + + public static EnterpriseStandard generateRandomEnterpriseStandard() { + EnterpriseStandard enterpriseStandard = new EnterpriseStandard(); + + enterpriseStandard.setDelFlag(faker.bool().bool() ? 1 : 0); + enterpriseStandard.setStandardCode(faker.code().ean13()); + enterpriseStandard.setNameCode(faker.code().asin()); + enterpriseStandard.setCategoryCode(faker.commerce().department()); + enterpriseStandard.setYearNumber(String.valueOf(faker.number().numberBetween(1990, 2023))); + enterpriseStandard.setStandardCategory(faker.commerce().department()); + enterpriseStandard.setGradeClassification(faker.book().genre()); + enterpriseStandard.setCompIllustration(faker.lorem().sentence()); + enterpriseStandard.setTryFlag(faker.bool().bool() ? 1 : 0); + enterpriseStandard.setTrialPeriod(String.valueOf(faker.number().numberBetween(1, 12)) + " months"); + enterpriseStandard.setMainDraftingUser(faker.name().fullName()); + enterpriseStandard.setMainDraftingUnit(faker.company().name()); + enterpriseStandard.setMainDraftingUnitResponsiblePerson(faker.name().fullName()); + enterpriseStandard.setApplicableMajor(faker.educator().course()); + enterpriseStandard.setCooperationUnit(faker.company().name()); + enterpriseStandard.setPartName(faker.lorem().word()); + + // ... continue with more fields as needed + + enterpriseStandard.setStandardNo(faker.code().ean8()); + enterpriseStandard.setStandardName(faker.commerce().productName()); + enterpriseStandard.setEnglishName(faker.commerce().productName()); + enterpriseStandard.setReleaseDate(faker.date().past(1, TimeUnit.SECONDS)); + enterpriseStandard.setImplementationDate(faker.date().past(1, TimeUnit.SECONDS)); + enterpriseStandard.setStandardState(faker.random().nextInt(5)); + + return enterpriseStandard; + } + @Test + public void insertRandomES() { + EnterpriseStandard randomData = generateRandomEnterpriseStandard(); + enterpriseStandardService.save(randomData); + System.out.println(randomData); + } + +}