feat: 法规符合性评估库实体类添加注解

laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java

@@ -18,11 +18,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.List;
@@ -40,19 +39,19 @@ import java.util.List;
 @Slf4j
 public class LawsEvaluationNotMetController extends JeroController<LawsEvaluationNotMet, ILawsEvaluationNotMetService> {
 
-	@Autowired
+	@Resource
 	private ILawsEvaluationNotMetService lawsEvaluationNotMetService;
 
-	@Autowired
+	@Resource
 	private ILawsEvaluationNotMetLibraryService lawsEvaluationNotMetLibraryService;
 
 	/**
 	 * 分页列表查询
 	 */
-//	@RequiresPermissions(value = {"inconformityItem:search","vehicleItemLibrary:detail:noMatchItemDetail"})
 	@AutoLog(value = "不符合项-分页列表查询")
 	@ApiOperation(value="不符合项-分页列表查询", notes="不符合项-分页列表查询")
 	@GetMapping(value = "/page")
+	@RequiresPermissions("lawsEvaluationNotMet:search")
 	public Result<IPage<LawsEvaluationNotMetLibrary>> queryPageList(LawsEvaluationNotMetLibrary lawsEvaluationNotMet,
 															 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -61,47 +60,6 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 		return Result.OK(pageList);
 	}
 
-	/**
-	 *   添加
-	 */
-	@RequiresPermissions("inconformityItem:add")
-	@AutoLog(value = "不符合项-添加")
-	@ApiOperation(value="不符合项-添加", notes="不符合项-添加")
-	@PostMapping(value = "/add")
-	public Result<T> add(@Validated @RequestBody LawsEvaluationNotMet lawsEvaluationNotMet) {
-		lawsEvaluationNotMetService.add(lawsEvaluationNotMet);
-		return Result.OK(ResultCommon.OK);
-	}
-
-	/**
-	 *  编辑
-	 */
-	@RequiresPermissions("inconformityItem:edit")
-	@AutoLog(value = "不符合项-编辑")
-	@ApiOperation(value="不符合项-编辑", notes="不符合项-编辑")
-	@PostMapping(value = "/edit")
-	public Result<T> edit(@Validated @RequestBody LawsEvaluationNotMet lawsEvaluationNotMet) {
-		lawsEvaluationNotMetService.editById(lawsEvaluationNotMet);
-		return Result.OK(ResultCommon.OK);
-	}
-
-
-
-	/**
-	 * 通过id查询
-	 */
-	@RequiresPermissions("inconformityItem:view")
-	@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);
-		if(lawsEvaluationNotMet==null) {
-			throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
-		}
-		return Result.OK(lawsEvaluationNotMet);
-	}
-
 	 /**
 	  * 批量关闭
 	  */

laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java

@@ -1,5 +1,6 @@
 package com.jero.modules.assessmentLibrary.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,7 +23,8 @@ public class LawsConformityAssessmentLibrary implements Serializable {
     /**
      * 主键ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键ID")
     private String id;
 
     /**

laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java

@@ -1,10 +1,13 @@
 package com.jero.modules.assessmentLibrary.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -17,107 +20,128 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable {
     /**
      * 主键ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键ID")
     private String id;
 
     /**
      * 创建人ID
      */
+    @ApiModelProperty(value = "创建人ID")
     private String createBy;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
     /**
      * 修改人ID
      */
+    @ApiModelProperty(value = "修改人ID")
     private String updateBy;
 
     /**
      * 修改时间
      */
+    @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
     /**
      * 部门code
      */
+    @ApiModelProperty(value = "部门code")
     private String orgCode;
 
     /**
      * 条款号
      */
+    @ApiModelProperty(value = "条款号")
     private String termNumber;
 
     /**
      * 条款内容
      */
+    @ApiModelProperty(value = "条款内容")
     private String termContent;
 
     /**
      * 车型
      */
+    @ApiModelProperty(value = "车型")
     private String model;
 
     /**
      * 车型状态
      */
+    @ApiModelProperty(value = "车型状态")
     private String modelStatus;
 
     /**
      * 责任部门
      */
+    @ApiModelProperty(value = "责任部门")
     private String authDept;
 
     /**
      * 评估人
      */
+    @ApiModelProperty(value = "评估人")
     private String userId;
 
     /**
      * 评估结果
      */
+    @ApiModelProperty(value = "评估结果")
     private String result;
 
     /**
      * 问题描述
      */
+    @ApiModelProperty(value = "问题描述")
     private String description;
 
     /**
      * 不满足要求的现状
      */
-    private String unsatisfyRequire;
+    @ApiModelProperty(value = "不满足要求的现状")
+    private String unsatisfiedRequire;
 
     /**
      * 整改方案
      */
+    @ApiModelProperty(value = "整改方案")
     private String correctionSolution;
 
     /**
      * 整改费用
      */
+    @ApiModelProperty(value = "整改费用")
     private String correctionCost;
 
     /**
      * 与其他项目共用性
      */
+    @ApiModelProperty(value = "与其他项目共用性")
     private String commonality;
 
     /**
      * 共用后本项目所需费用
      */
+    @ApiModelProperty(value = "共用后本项目所需费用")
     private String commonalityCost;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
     /**
      * 佐证材料
      */
+    @ApiModelProperty(value = "佐证材料")
     private String material;
 
     @TableField(exist = false)

laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java

@@ -1,5 +1,6 @@
 package com.jero.modules.assessmentLibrary.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -19,135 +20,160 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 public class LawsEvaluationNotMetLibrary implements Serializable {
 
-    /**
-     * 主键ID
-     */
-    @TableId
+
+    /**主键ID*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键ID")
     private String id;
 
     /**
      * 部门code
      */
+    @ApiModelProperty(value = "部门code")
     private String orgCode;
 
     /**
      * 创建人ID
      */
+    @ApiModelProperty(value = "创建人ID")
     private String createBy;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
     /**
      * 修改人ID
      */
+    @ApiModelProperty(value = "修改人ID")
     private String updateBy;
 
     /**
      * 修改时间
      */
+    @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
     /**
      * 删除标识
      */
+    @ApiModelProperty(value = "删除标识")
     private Integer delFlag;
 
     /**
      * 条款号
      */
+    @ApiModelProperty(value = "条款号")
     private String termNumber;
 
     /**
      * 条款内容
      */
+    @ApiModelProperty(value = "条款内容")
     private String termContent;
 
     /**
      * 车型
      */
+    @ApiModelProperty(value = "车型")
     private String model;
 
     /**
      * 车型状态
      */
+    @ApiModelProperty(value = "车型状态")
     private String modelStatus;
 
     /**
      * 责任部门
      */
+    @ApiModelProperty(value = "责任部门")
     private String authDept;
 
     /**
      * 评估人
      */
+    @ApiModelProperty(value = "评估人")
     private String userId;
 
     /**
      * 评估结果
      */
+    @ApiModelProperty(value = "评估结果")
     private String result;
 
     /**
      * 问题描述
      */
+    @ApiModelProperty(value = "问题描述")
     private String description;
 
     /**
      * 不满足要求的现状
      */
+    @ApiModelProperty(value = "不满足要求的现状")
     private String unsatisfiedRequire;
 
     /**
      * 整改方案
      */
+    @ApiModelProperty(value = "整改方案")
     private String correctionSolution;
 
     /**
      * 整改费用
      */
+    @ApiModelProperty(value = "整改费用")
     private String correctionCost;
 
     /**
      * 与其他项目共用性
      */
+    @ApiModelProperty(value = "与其他项目共用性")
     private String commonality;
 
     /**
      * 共用后本项目所需费用
      */
+    @ApiModelProperty(value = "共用后本项目所需费用")
     private String commonalityCost;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
     /**
      * 佐证材料
      */
+    @ApiModelProperty(value = "佐证材料")
     private String material;
 
     /**
      * 整改状态
      */
+    @ApiModelProperty(value = "整改状态")
     private String rectifyStatus;
 
     /**
      * pcr编号
      */
+    @ApiModelProperty(value = "pcr编号")
     private String pcrNo;
 
     /**
      * 问题类型
      */
+    @ApiModelProperty(value = "问题类型")
     private String problemType;
 
     /**
      * 整改周期
      */
+    @ApiModelProperty(value = "整改周期")
     private String correctionPeriod;
 
     /**
@@ -161,6 +187,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
     /**
      * 附件
      */
+    @ApiModelProperty(value = "附件")
     private String file;
 
     /**

laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryDetailMapper.xml

@@ -2,7 +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.LawsConformityAssessmentLibraryDetailMapper">
+<mapper namespace="com.jero.modules.assessmentLibrary.mapper.LawsConformityAssessmentLibraryDetailMapper">
 
     <resultMap id="BaseResultMap" type="com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail">
             <id property="id" column="id" jdbcType="VARCHAR"/>
@@ -19,7 +19,7 @@
             <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="unsatisfiedRequire" column="unsatisfied_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"/>
@@ -33,7 +33,7 @@
         update_by,update_time,org_code,
         term_number,term_content,model,
         model_status,auth_dept,user_id,
-        result,description,unsatisfy_require,
+        result,description,unsatisfied_require,
         correction_solution,correction_cost,commonality,
         commonality_cost,remark,material
     </sql>

laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java

@@ -5,15 +5,17 @@ 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.LawsConformityAssessmentLibrary;
 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.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 /**
  * @author ThinkBook
@@ -30,15 +32,21 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
 
     @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);
-//		}
+        QueryWrapper<LawsEvaluationNotMetLibrary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getStandardNumber()),
+                "d.standard_number", lawsEvaluationNotMet.getStandardNumber());
+        queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getStandardName()),
+                "d.standard_name", lawsEvaluationNotMet.getStandardName());
+        queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getModel()),
+                "nm.model", lawsEvaluationNotMet.getModel());
+        if (StringUtils.isNotBlank(lawsEvaluationNotMet.getProblemType())) {
+            queryWrapper.in("nm.auth_dept", Arrays.asList(lawsEvaluationNotMet.getAuthDept().split(",")));
+        }
+        queryWrapper.eq(StringUtils.isNotBlank(lawsEvaluationNotMet.getRectifyStatus()),
+                "nm.rectify_status", lawsEvaluationNotMet.getRectifyStatus());
+        queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getPcrNo()),
+                "nm.pcr_no", lawsEvaluationNotMet.getPcrNo());
+        queryWrapper.orderByDesc("nm.create_time");
         Page<LawsEvaluationNotMetLibrary> page = new Page<>(pageNo, pageSize);
         return notMetMapper.pageList(page, queryWrapper, lawsEvaluationNotMet);
     }