feat: 法规符合性评估-不符合项库列表接口

2024-06-24 20:01:58 +08:00
parent b599552cb5
commit 42ec1744c4
11 changed files with 191 additions and 279 deletions
@@ -6,6 +6,8 @@ import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary;
+import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryService;
 import com.jero.modules.projectLibrary.common.AssessCommon;
 import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet;
 import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService;
@@ -27,12 +29,12 @@ import java.util.List;


 /**
- * @Description: 未符合项
+ * @Description: 不符合项
 * @Author: jero-boot
 * @Date:   2023-09-11
 * @Version: V1.0
 */
-@Api(tags="未符合项")
+@Api(tags="不符合项")
@RestController
@RequestMapping("/assessment/lawsEvaluationNotMet")
@Slf4j
@@ -41,18 +43,21 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 	@Autowired
 	private ILawsEvaluationNotMetService lawsEvaluationNotMetService;

+	@Autowired
+	private ILawsEvaluationNotMetLibraryService lawsEvaluationNotMetLibraryService;
+
 	/**
 	 * 分页列表查询
 	 */
 //	@RequiresPermissions(value = {"inconformityItem:search","vehicleItemLibrary:detail:noMatchItemDetail"})
-	@AutoLog(value = "未符合项-分页列表查询")
-	@ApiOperation(value="未符合项-分页列表查询", notes="未符合项-分页列表查询")
+	@AutoLog(value = "不符合项-分页列表查询")
+	@ApiOperation(value="不符合项-分页列表查询", notes="不符合项-分页列表查询")
 	@GetMapping(value = "/page")
-	public Result<IPage<LawsEvaluationNotMet>> queryPageList(LawsEvaluationNotMet lawsEvaluationNotMet,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		IPage<LawsEvaluationNotMet> pageList = lawsEvaluationNotMetService.queryPage(lawsEvaluationNotMet, pageNo, pageSize, req);
+	public Result<IPage<LawsEvaluationNotMetLibrary>> queryPageList(LawsEvaluationNotMetLibrary lawsEvaluationNotMet,
+															 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															 HttpServletRequest req) {
+		IPage<LawsEvaluationNotMetLibrary> pageList = lawsEvaluationNotMetLibraryService.queryPage(lawsEvaluationNotMet, pageNo, pageSize, req);
 		return Result.OK(pageList);
 	}

@@ -60,8 +65,8 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 	 *   添加
 	 */
 	@RequiresPermissions("inconformityItem:add")
-	@AutoLog(value = "未符合项-添加")
-	@ApiOperation(value="未符合项-添加", notes="未符合项-添加")
+	@AutoLog(value = "不符合项-添加")
+	@ApiOperation(value="不符合项-添加", notes="不符合项-添加")
 	@PostMapping(value = "/add")
 	public Result<T> add(@Validated @RequestBody LawsEvaluationNotMet lawsEvaluationNotMet) {
 		lawsEvaluationNotMetService.add(lawsEvaluationNotMet);
@@ -72,8 +77,8 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 	 *  编辑
 	 */
 	@RequiresPermissions("inconformityItem:edit")
-	@AutoLog(value = "未符合项-编辑")
-	@ApiOperation(value="未符合项-编辑", notes="未符合项-编辑")
+	@AutoLog(value = "不符合项-编辑")
+	@ApiOperation(value="不符合项-编辑", notes="不符合项-编辑")
 	@PostMapping(value = "/edit")
 	public Result<T> edit(@Validated @RequestBody LawsEvaluationNotMet lawsEvaluationNotMet) {
 		lawsEvaluationNotMetService.editById(lawsEvaluationNotMet);
@@ -86,8 +91,8 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 	 * 通过id查询
 	 */
 	@RequiresPermissions("inconformityItem:view")
-	@AutoLog(value = "未符合项-通过id查询")
-	@ApiOperation(value="未符合项-通过id查询", notes="未符合项-通过id查询")
+	@AutoLog(value = "不符合项-通过id查询")
+	@ApiOperation(value="不符合项-通过id查询", notes="不符合项-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<LawsEvaluationNotMet> queryById(@RequestParam(name="id",required=true) String id) {
 		LawsEvaluationNotMet lawsEvaluationNotMet = lawsEvaluationNotMetService.queryById(id);
@@ -101,8 +106,8 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 	  * 批量关闭
 	  */
 	 @RequiresPermissions("inconformityItem:batchClose")
-	 @AutoLog(value = "未符合项-批量关闭")
-	 @ApiOperation(value="未符合项-批量关闭", notes="项目库-批量关闭")
+	 @AutoLog(value = "不符合项-批量关闭")
+	 @ApiOperation(value="不符合项-批量关闭", notes="项目库-批量关闭")
 	 @PostMapping(value = "/batchClose")
 	 public Result<T> batchClose(@RequestBody IdsMapBody body) {
 		 String ids = body.getIds();
@@ -138,7 +143,7 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 	@RequiresPermissions("inconformityItem:export")
    @GetMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, LawsEvaluationNotMet lawsEvaluationNotMet) {
-        return super.exportXls(request, lawsEvaluationNotMet, LawsEvaluationNotMet.class, "未符合项");
+        return super.exportXls(request, lawsEvaluationNotMet, LawsEvaluationNotMet.class, "不符合项");
    }

 }
@@ -5,7 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;

 /**
 * 不符合项库
@@ -14,6 +18,7 @@ import lombok.Data;
@TableName(value ="laws_evaluation_not_met_library")
@Data
 public class LawsEvaluationNotMetLibrary implements Serializable {
+
    /**
     * 主键ID
     */
@@ -51,34 +56,123 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
    private Integer delFlag;

    /**
-     * 来源
+     * 条款号
     */
-    private String source;
+    private String termNumber;

    /**
-     * 标准id
+     * 条款内容
     */
+    private String termContent;
+
+    /**
+     * 车型
+     */
+    private String model;
+
+    /**
+     * 车型状态
+     */
+    private String modelStatus;
+
+    /**
+     * 责任部门
+     */
+    private String authDept;
+
+    /**
+     * 评估人
+     */
+    private String userId;
+
+    /**
+     * 评估结果
+     */
+    private String result;
+
+    /**
+     * 问题描述
+     */
+    private String description;
+
+    /**
+     * 不满足要求的现状
+     */
+    private String unsatisfiedRequire;
+
+    /**
+     * 整改方案
+     */
+    private String correctionSolution;
+
+    /**
+     * 整改费用
+     */
+    private String correctionCost;
+
+    /**
+     * 与其他项目共用性
+     */
+    private String commonality;
+
+    /**
+     * 共用后本项目所需费用
+     */
+    private String commonalityCost;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 佐证材料
+     */
+    private String material;
+
+    /**
+     * 整改状态
+     */
+    private String rectifyStatus;
+
+    /**
+     * pcr编号
+     */
+    private String pcrNo;
+
+    /**
+     * 整改完成日期
+     */
+    @ApiModelProperty(value = "整改完成日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date rectifyCompleteDate;
+
+    /**
+     * 附件
+     */
+    private String file;
+
+    /**
+     * 标准ID
+     */
+    @ApiModelProperty(value = "标准ID")
    private String standardId;

    /**
     * 标准编号
     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准编号")
    private String standardNumber;

    /**
     * 标准名称
     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准名称")
    private String standardName;

-    /**
-     * 适用市场
-     */
-    private String applicableMarket;
-
-    /**
-     * 评估日期
-     */
-    private Date evaluateDate;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
@@ -1,130 +0,0 @@
-package com.jero.modules.assessmentLibrary.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * 
- * @TableName laws_evaluation_not_met_library_detail
- */
-@TableName(value ="laws_evaluation_not_met_library_detail")
-@Data
-public class LawsEvaluationNotMetLibraryDetail implements Serializable {
-    /**
-     * 主键ID
-     */
-    @TableId
-    private String id;
-
-    /**
-     * 部门code
-     */
-    private String orgCode;
-
-    /**
-     * 创建人ID
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人ID
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 删除标识
-     */
-    private Integer delFlag;
-
-    /**
-     * 条款号
-     */
-    private String termNumber;
-
-    /**
-     * 条款内容
-     */
-    private String termContent;
-
-    /**
-     * 车型
-     */
-    private String model;
-
-    /**
-     * 车型状态
-     */
-    private String modelStatus;
-
-    /**
-     * 责任部门
-     */
-    private String authDept;
-
-    /**
-     * 评估人
-     */
-    private String userId;
-
-    /**
-     * 评估结果
-     */
-    private String result;
-
-    /**
-     * 问题描述
-     */
-    private String description;
-
-    /**
-     * 不满足要求的现状
-     */
-    private String unsatisfyRequire;
-
-    /**
-     * 整改方案
-     */
-    private String correctionSolution;
-
-    /**
-     * 整改费用
-     */
-    private String correctionCost;
-
-    /**
-     * 与其他项目共用性
-     */
-    private String commonality;
-
-    /**
-     * 共用后本项目所需费用
-     */
-    private String commonalityCost;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 佐证材料
-     */
-    private String material;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-}
@@ -1,18 +0,0 @@
-package com.jero.modules.assessmentLibrary.mapper;
-
-import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibraryDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author ThinkBook
-* @description 针对表【laws_evaluation_not_met_library_detail】的数据库操作Mapper
-* @createDate 2024-06-24 14:48:05
-* @Entity com.jero.modules.laws.assessment.entity.LawsEvaluationNotMetLibraryDetail
-*/
-public interface LawsEvaluationNotMetLibraryDetailMapper extends BaseMapper<LawsEvaluationNotMetLibraryDetail> {
-
-}
-
-
-
-
@@ -1,7 +1,12 @@
 package com.jero.modules.assessmentLibrary.mapper;

+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;

 /**
 * @author ThinkBook
@@ -11,6 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface LawsEvaluationNotMetLibraryMapper extends BaseMapper<LawsEvaluationNotMetLibrary> {

+    IPage<LawsEvaluationNotMetLibrary> pageList(Page<LawsEvaluationNotMetLibrary> page, @Param(Constants.WRAPPER) QueryWrapper<LawsEvaluationNotMetLibrary> queryWrapper, LawsEvaluationNotMetLibrary lawsEvaluationNotMet);
 }


@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jero.modules.assessment.mapper.LawsEvaluationNotMetLibraryDetailMapper">
-
-    <resultMap id="BaseResultMap" type="com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibraryDetail">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="delFlag" column="del_flag" jdbcType="TINYINT"/>
-            <result property="termNumber" column="term_number" jdbcType="VARCHAR"/>
-            <result property="termContent" column="term_content" jdbcType="VARCHAR"/>
-            <result property="model" column="model" jdbcType="VARCHAR"/>
-            <result property="modelStatus" column="model_status" jdbcType="VARCHAR"/>
-            <result property="authDept" column="auth_dept" jdbcType="VARCHAR"/>
-            <result property="userId" column="user_id" jdbcType="VARCHAR"/>
-            <result property="result" column="result" jdbcType="VARCHAR"/>
-            <result property="description" column="description" jdbcType="VARCHAR"/>
-            <result property="unsatisfyRequire" column="unsatisfy_require" jdbcType="VARCHAR"/>
-            <result property="correctionSolution" column="correction_solution" jdbcType="VARCHAR"/>
-            <result property="correctionCost" column="correction_cost" jdbcType="VARCHAR"/>
-            <result property="commonality" column="commonality" jdbcType="VARCHAR"/>
-            <result property="commonalityCost" column="commonality_cost" jdbcType="VARCHAR"/>
-            <result property="remark" column="remark" jdbcType="VARCHAR"/>
-            <result property="material" column="material" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,org_code,create_by,
-        create_time,update_by,update_time,
-        del_flag,term_number,term_content,
-        model,model_status,auth_dept,
-        user_id,result,description,
-        unsatisfy_require,correction_solution,correction_cost,
-        commonality,commonality_cost,remark,
-        material
-    </sql>
-</mapper>
@@ -2,23 +2,7 @@
 <!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jero.modules.assessment.mapper.LawsEvaluationNotMetLibraryMapper">
-
-    <resultMap id="BaseResultMap" type="com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
-            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="delFlag" column="del_flag" jdbcType="TINYINT"/>
-            <result property="source" column="source" jdbcType="VARCHAR"/>
-            <result property="standardId" column="standard_id" jdbcType="VARCHAR"/>
-            <result property="standardNumber" column="standard_number" jdbcType="VARCHAR"/>
-            <result property="standardName" column="standard_name" jdbcType="VARCHAR"/>
-            <result property="applicableMarket" column="applicable_market" jdbcType="VARCHAR"/>
-            <result property="evaluateDate" column="evaluate_date" jdbcType="TIMESTAMP"/>
-    </resultMap>
+<mapper namespace="com.jero.modules.assessmentLibrary.mapper.LawsEvaluationNotMetLibraryMapper">

    <sql id="Base_Column_List">
        id,org_code,create_by,
@@ -27,4 +11,14 @@
        standard_number,standard_name,applicable_market,
        evaluate_date
    </sql>
+
+    <select id="pageList" resultType="com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary">
+        select nm.* ,
+                d.standard_name,
+                d.standard_number
+        from laws_evaluation_not_met_library nm
+                             left join laws_domestic_standard as d on d.id = nm.standard_id
+
+            ${ew.customSqlSegment}
+    </select>
 </mapper>
@@ -1,13 +0,0 @@
-package com.jero.modules.assessmentLibrary.service;
-
-import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibraryDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
-* @author ThinkBook
-* @description 针对表【laws_evaluation_not_met_library_detail】的数据库操作Service
-* @createDate 2024-06-24 14:48:05
-*/
-public interface ILawsEvaluationNotMetLibraryDetailService extends IService<LawsEvaluationNotMetLibraryDetail> {
-
-}
@@ -1,7 +1,11 @@
 package com.jero.modules.assessmentLibrary.service;

+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet;
+
+import javax.servlet.http.HttpServletRequest;

 /**
 * @author ThinkBook
@@ -10,4 +14,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface ILawsEvaluationNotMetLibraryService extends IService<LawsEvaluationNotMetLibrary> {

+    /**
+     * 分页查询
+     *
+     * @param lawsEvaluationNotMet
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    IPage<LawsEvaluationNotMetLibrary> queryPage(LawsEvaluationNotMetLibrary lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req);
+
 }
@@ -1,24 +0,0 @@
-package com.jero.modules.assessmentLibrary.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibraryDetail;
-import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryDetailService;
-import com.jero.modules.assessmentLibrary.mapper.LawsEvaluationNotMetLibraryDetailMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
-* @author ThinkBook
-* @description 针对表【laws_evaluation_not_met_library_detail】的数据库操作Service实现
-* @createDate 2024-06-24 14:48:05
-*/
-@Service
-@Slf4j
-public class LawsEvaluationNotMetLibraryDetailServiceImpl extends ServiceImpl<LawsEvaluationNotMetLibraryDetailMapper, LawsEvaluationNotMetLibraryDetail>
-    implements ILawsEvaluationNotMetLibraryDetailService {
-
-}
-
-
-
-
@@ -1,22 +1,47 @@
 package com.jero.modules.assessmentLibrary.service.impl;

+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.query.QueryGenerator;
 import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary;
 import com.jero.modules.assessmentLibrary.mapper.LawsEvaluationNotMetLibraryMapper;
 import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryService;
+import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
 /**
-* @author ThinkBook
-* @description 针对表【laws_evaluation_not_met_library(不符合项库)】的数据库操作Service实现
-* @createDate 2024-06-24 14:48:02
-*/
+ * @author ThinkBook
+ * @description 针对表【laws_evaluation_not_met_library(不符合项库)】的数据库操作Service实现
+ * @createDate 2024-06-24 14:48:02
+ */
@Service
@Slf4j
 public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEvaluationNotMetLibraryMapper, LawsEvaluationNotMetLibrary>
-    implements ILawsEvaluationNotMetLibraryService {
+        implements ILawsEvaluationNotMetLibraryService {

+    @Resource
+    private LawsEvaluationNotMetLibraryMapper notMetMapper;
+
+    @Override
+    public IPage<LawsEvaluationNotMetLibrary> queryPage(LawsEvaluationNotMetLibrary lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<LawsEvaluationNotMetLibrary> queryWrapper = QueryGenerator.initQueryWrapper(lawsEvaluationNotMet, req.getParameterMap());
+//		String engineerName = lawsEvaluationNotMet.getEngineerName();
+//		if (StringUtils.isNotBlank(engineerName)){
+//			queryWrapper.like("su.realname",engineerName);
+//		}
+//		String workNumber = lawsEvaluationNotMet.getWorkNumber();
+//		if (StringUtils.isNotBlank(workNumber)){
+//			queryWrapper.like("lpl.work_number",workNumber);
+//		}
+        Page<LawsEvaluationNotMetLibrary> page = new Page<>(pageNo, pageSize);
+        return notMetMapper.pageList(page, queryWrapper, lawsEvaluationNotMet);
+    }
 }