feat: 企标复审列表

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<EnterpriseStandardRecheckPlan, EnterpriseStandardRecheckPlanService> {
+
+	@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<EnterpriseStandardRecheckPlanVo> pageList= recheckPlanService.queryPageList(esDeclare, pageNo, pageSize);
+		return Result.OK(pageList);
+	}
+}

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;
+}

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<EnterpriseStandardRecheckPlan> {
 
+    /**
+     * 复审列表
+     * @param page
+     * @param esRecheckPlan
+     * @return
+     */
+    IPage<EnterpriseStandardRecheckPlanVo> page(IPage<EnterpriseStandardRecheckPlanVo> page, @Param("param") ESQueryCommonDTO esRecheckPlan);
 }
 
 

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
     </sql>
+
+    <select id="page" resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo">
+        SELECT
+            p.id,
+            s.standard_no AS standardNo,
+            s.standard_name AS standardName,
+            s.release_date AS releaseDate,
+            p.recheck_date AS recheckDate,
+            p.recheck_result AS recheckResult,
+            u.username AS mainDraftingUser,
+            d.depart_name AS mainDraftingUnit
+        FROM
+            laws_enterprise_standard_recheck_plan AS p
+                LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = p.standard_no
+                LEFT JOIN sys_user AS u ON u.id = s.main_drafting_user
+                LEFT JOIN sys_depart AS d ON d.id = s.main_drafting_unit
+        WHERE
+            (p.recheck_date BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH))
+           OR
+            (p.recheck_result IS NOT NULL)
+            <!--企标编号判断-->
+            <if test="param.standardNo != null and param.standardNo != ''">
+                AND s.standard_no LIKE CONCAT('%',#{param.standardNo},'%')
+            </if>
+            <!--企标名称判断-->
+            <if test="param.standardName != null and param.standardName != ''">
+                AND s.standard_name LIKE CONCAT('%',#{param.standardName},'%')
+            </if>
+            <!--发布日期判断-->
+            <if test="param.releaseStartDate != null and param.releaseEndDate != null">
+                AND s.release_date BETWEEN #{param.releaseStartDate} AND #{param.releaseEndDate}
+            </if>
+            <!--复审日期判断-->
+            <if test="param.recheckStartDate != null and param.recheckEndDate != null">
+                AND p.recheck_date BETWEEN #{param.recheckStartDate} AND #{param.recheckEndDate}
+            </if>
+        ORDER BY
+            p.create_time DESC
+    </select>
 </mapper>

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<EnterpriseStandardRecheckPlan> {
 
+    /**
+     * 企标复审计划-分页列表查询
+     * @param esRecheckPlan
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    IPage<EnterpriseStandardRecheckPlanVo> queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize);
 }

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<EnterpriseStandardRecheckPlanMapper, EnterpriseStandardRecheckPlan>
     implements EnterpriseStandardRecheckPlanService{
 
+    @Resource
+    private ISysBaseAPI sysBaseAPI;
+
+    @Resource
+    private EnterpriseStandardRecheckPlanMapper esRecheckPlanMapper;
+
+    @Override
+    public IPage<EnterpriseStandardRecheckPlanVo> queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize) {
+        IPage<EnterpriseStandardRecheckPlanVo> page = new Page<>(pageNo, pageSize);
+        esRecheckPlanMapper.page(page, esRecheckPlan);
+        this.transRecheckPlanVo(page.getRecords());
+        return page;
+    }
+
+    // 转换列表中的状态值为中文
+    private void transRecheckPlanVo(List<EnterpriseStandardRecheckPlanVo> list) {
+        if (list.isEmpty()) {
+            return;
+        }
+        List<DictModel> ynDictModelList = sysBaseAPI.getDictItems("en_laws_recheck_result");
+        list.forEach(e -> {
+            List<DictModel> collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getRecheckResult())).collect(Collectors.toList());
+            if (!collect.isEmpty()) {
+                e.setRecheckResult(collect.get(0).getText());
+            }
+        });
+    }
 }