From b6b5da69515667374241d00966e6a1732526cac7 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 24 Jun 2024 17:59:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsConformityAssessmentController.java | 46 +++++++ .../LawsEvaluationNotMetController.java | 23 ++-- .../LawsConformityAssessmentLibrary.java | 81 +++++++++++ ...LawsConformityAssessmentLibraryDetail.java | 125 +++++++++++++++++ .../entity/LawsEvaluationNotMetLibrary.java | 85 ++++++++++++ .../LawsEvaluationNotMetLibraryDetail.java | 130 ++++++++++++++++++ ...nformityAssessmentLibraryDetailMapper.java | 18 +++ ...LawsConformityAssessmentLibraryMapper.java | 21 +++ ...wsEvaluationNotMetLibraryDetailMapper.java | 18 +++ .../LawsEvaluationNotMetLibraryMapper.java | 18 +++ ...onformityAssessmentLibraryDetailMapper.xml | 40 ++++++ .../LawsConformityAssessmentLibraryMapper.xml | 32 +++++ ...awsEvaluationNotMetLibraryDetailMapper.xml | 42 ++++++ .../xml/LawsEvaluationNotMetLibraryMapper.xml | 30 ++++ ...formityAssessmentLibraryDetailService.java | 13 ++ ...awsConformityAssessmentLibraryService.java | 15 ++ ...sEvaluationNotMetLibraryDetailService.java | 13 ++ .../ILawsEvaluationNotMetLibraryService.java | 13 ++ ...ityAssessmentLibraryDetailServiceImpl.java | 24 ++++ ...onformityAssessmentLibraryServiceImpl.java | 53 +++++++ ...luationNotMetLibraryDetailServiceImpl.java | 24 ++++ ...awsEvaluationNotMetLibraryServiceImpl.java | 24 ++++ .../mapper/mapperxml/ProcessDemoMapper.xml | 19 --- 23 files changed, 874 insertions(+), 33 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java rename laws-modules/src/main/java/com/jero/modules/{projectLibrary => assessmentLibrary}/controller/LawsEvaluationNotMetController.java (95%) create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibraryDetail.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryDetailMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsEvaluationNotMetLibraryDetailMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsEvaluationNotMetLibraryMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryDetailMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryDetailMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryDetailService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryDetailService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryDetailServiceImpl.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryDetailServiceImpl.java create mode 100644 laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java delete mode 100644 laws-modules/src/main/resources/com/jero/modules/activiti/process/demo/mapper/mapperxml/ProcessDemoMapper.xml diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java new file mode 100644 index 00000000..ae5ca6ed --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java @@ -0,0 +1,46 @@ +package com.jero.modules.assessmentLibrary.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.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; +import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService; +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; + +@Api(tags = "法规符合性评估库-法规符合性评估库") +@RestController +@RequestMapping("/laws/lawsConformityAssessment") +@Slf4j +public class LawsConformityAssessmentController { + + @Resource + private ILawsConformityAssessmentLibraryService lawsConformityAssessmentLibraryService; + + /** + * 分页列表查询 + * + * @param lawsConformityAssessmentLibrary + * @param pageNo + * @param pageSize + * @return + */ + @AutoLog(value = "法规符合性评估库-法规符合性评估库-分页列表查询") + @ApiOperation(value = "法规符合性评估库-法规符合性评估库-分页列表查询", notes = "法规符合性评估库-法规符合性评估库-分页列表查询") + @GetMapping(value = "/page") +// @RequiresPermissions("") + public Result> queryPageList(LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage pageList = lawsConformityAssessmentLibraryService.queryPage(lawsConformityAssessmentLibrary, pageNo, pageSize); + return Result.OK(pageList); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java similarity index 95% rename from laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java rename to laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java index c8b09ae6..9d9862e1 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java @@ -1,33 +1,28 @@ -package com.jero.modules.projectLibrary.controller; +package com.jero.modules.assessmentLibrary.controller; -import javax.servlet.http.HttpServletRequest; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; import com.jero.common.api.vo.ResultCommon; -import com.jero.modules.laws.common.constant.FieldCommon; -import com.jero.modules.laws.common.util.CurrentUserUtil; +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.projectLibrary.common.AssessCommon; import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet; import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.system.vo.IdsMapBody; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; 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 io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.apache.poi.ss.formula.functions.T; - +import javax.servlet.http.HttpServletRequest; import java.util.Arrays; -import java.util.Date; import java.util.List; diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java new file mode 100644 index 00000000..401dcfb4 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java @@ -0,0 +1,81 @@ +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 io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 法规符合性评估库 + * @TableName laws_conformity_assessment_library + */ +@TableName(value ="laws_conformity_assessment_library") +@Data +public class LawsConformityAssessmentLibrary implements Serializable { + + /** + * 主键ID + */ + @TableId + private String id; + + /** + * 来源 + */ + @ApiModelProperty(value = "来源") + private String source; + + /** + * 标准ID + */ + @ApiModelProperty(value = "标准ID") + private String standardId; + + /** + * 评估日期 + */ + @ApiModelProperty(value = "评估日期") + private Date valuationTime; + + /** + * 开始评估日期 + */ + @TableField(exist = false) + @ApiModelProperty(value = "开始评估日期") + private Date startValuationTime; + + /** + * 结束评估日期 + */ + @TableField(exist = false) + @ApiModelProperty(value = "结束评估日期") + private Date endValuationTime; + + /** + * 标准编号 + */ + @TableField(exist = false) + @ApiModelProperty(value = "标准编号") + private String standardNumber; + + /** + * 标准名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "标准名称") + private String standardName; + + /** + * 适用市场 + */ + @TableField(exist = false) + @ApiModelProperty(value = "适用市场") + private String applicableMarket; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java new file mode 100644 index 00000000..0cc76193 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java @@ -0,0 +1,125 @@ +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_conformity_assessment_library_detail + */ +@TableName(value ="laws_conformity_assessment_library_detail") +@Data +public class LawsConformityAssessmentLibraryDetail implements Serializable { + /** + * 主键ID + */ + @TableId + private String id; + + /** + * 创建人ID + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 修改人ID + */ + private String updateBy; + + /** + * 修改时间 + */ + private Date updateTime; + + /** + * 部门code + */ + private String orgCode; + + /** + * 条款号 + */ + 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; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java new file mode 100644 index 00000000..3276ea2a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java @@ -0,0 +1,85 @@ +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 + */ +@TableName(value ="laws_evaluation_not_met_library") +@Data +public class LawsEvaluationNotMetLibrary 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 source; + + /** + * 标准id + */ + private String standardId; + + /** + * 标准编号 + */ + private String standardNumber; + + /** + * 标准名称 + */ + private String standardName; + + /** + * 适用市场 + */ + private String applicableMarket; + + /** + * 评估日期 + */ + private Date evaluateDate; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibraryDetail.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibraryDetail.java new file mode 100644 index 00000000..30111ef9 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibraryDetail.java @@ -0,0 +1,130 @@ +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; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryDetailMapper.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryDetailMapper.java new file mode 100644 index 00000000..55424135 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryDetailMapper.java @@ -0,0 +1,18 @@ +package com.jero.modules.assessmentLibrary.mapper; + +import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author ThinkBook +* @description 针对表【laws_conformity_assessment_library_detail】的数据库操作Mapper +* @createDate 2024-06-24 14:47:43 +* @Entity com.jero.modules.laws.assessment.entity.LawsConformityAssessmentLibraryDetail +*/ +public interface LawsConformityAssessmentLibraryDetailMapper extends BaseMapper { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryMapper.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryMapper.java new file mode 100644 index 00000000..5194a3c8 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryMapper.java @@ -0,0 +1,21 @@ +package com.jero.modules.assessmentLibrary.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author ThinkBook +* @description 针对表【laws_conformity_assessment_library(法规符合性评估库)】的数据库操作Mapper +* @createDate 2024-06-24 14:47:19 +* @Entity com.jero.modules.laws.assessment.entity.LawsConformityAssessmentLibrary +*/ +public interface LawsConformityAssessmentLibraryMapper extends BaseMapper { + + Page queryByPage(Page page, QueryWrapper queryWrapper); +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsEvaluationNotMetLibraryDetailMapper.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsEvaluationNotMetLibraryDetailMapper.java new file mode 100644 index 00000000..1afbcbf3 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsEvaluationNotMetLibraryDetailMapper.java @@ -0,0 +1,18 @@ +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 { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsEvaluationNotMetLibraryMapper.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsEvaluationNotMetLibraryMapper.java new file mode 100644 index 00000000..a83aa7d2 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsEvaluationNotMetLibraryMapper.java @@ -0,0 +1,18 @@ +package com.jero.modules.assessmentLibrary.mapper; + +import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author ThinkBook +* @description 针对表【laws_evaluation_not_met_library(不符合项库)】的数据库操作Mapper +* @createDate 2024-06-24 14:48:02 +* @Entity com.jero.modules.laws.assessment.entity.LawsEvaluationNotMetLibrary +*/ +public interface LawsEvaluationNotMetLibraryMapper extends BaseMapper { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryDetailMapper.xml b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryDetailMapper.xml new file mode 100644 index 00000000..8768f2f9 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryDetailMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,create_by,create_time, + update_by,update_time,org_code, + term_number,term_content,model, + model_status,auth_dept,user_id, + result,description,unsatisfy_require, + correction_solution,correction_cost,commonality, + commonality_cost,remark,material + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml new file mode 100644 index 00000000..701f09c8 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + id,source,standard_id, + standard_number,standard_name,valuation_time + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryDetailMapper.xml b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryDetailMapper.xml new file mode 100644 index 00000000..8bc4d1e7 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryDetailMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml new file mode 100644 index 00000000..c36ad9de --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + id,org_code,create_by, + create_time,update_by,update_time, + del_flag,source,standard_id, + standard_number,standard_name,applicable_market, + evaluate_date + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryDetailService.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryDetailService.java new file mode 100644 index 00000000..c4c6ef1f --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryDetailService.java @@ -0,0 +1,13 @@ +package com.jero.modules.assessmentLibrary.service; + +import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ThinkBook +* @description 针对表【laws_conformity_assessment_library_detail】的数据库操作Service +* @createDate 2024-06-24 14:47:43 +*/ +public interface ILawsConformityAssessmentLibraryDetailService extends IService { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryService.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryService.java new file mode 100644 index 00000000..89da93b9 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryService.java @@ -0,0 +1,15 @@ +package com.jero.modules.assessmentLibrary.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ThinkBook +* @description 针对表【laws_conformity_assessment_library(法规符合性评估库)】的数据库操作Service +* @createDate 2024-06-24 14:47:19 +*/ +public interface ILawsConformityAssessmentLibraryService extends IService { + + IPage queryPage(LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary, Integer pageNo, Integer pageSize); +} diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryDetailService.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryDetailService.java new file mode 100644 index 00000000..0f37ef9e --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryDetailService.java @@ -0,0 +1,13 @@ +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 { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryService.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryService.java new file mode 100644 index 00000000..5f4dc2fc --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryService.java @@ -0,0 +1,13 @@ +package com.jero.modules.assessmentLibrary.service; + +import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ThinkBook +* @description 针对表【laws_evaluation_not_met_library(不符合项库)】的数据库操作Service +* @createDate 2024-06-24 14:48:02 +*/ +public interface ILawsEvaluationNotMetLibraryService extends IService { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryDetailServiceImpl.java new file mode 100644 index 00000000..aff424dd --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryDetailServiceImpl.java @@ -0,0 +1,24 @@ +package com.jero.modules.assessmentLibrary.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail; +import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryDetailService; +import com.jero.modules.assessmentLibrary.mapper.LawsConformityAssessmentLibraryDetailMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** +* @author ThinkBook +* @description 针对表【laws_conformity_assessment_library_detail】的数据库操作Service实现 +* @createDate 2024-06-24 14:47:43 +*/ +@Service +@Slf4j +public class LawsConformityAssessmentLibraryDetailServiceImpl extends ServiceImpl + implements ILawsConformityAssessmentLibraryDetailService { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java new file mode 100644 index 00000000..61f6f603 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java @@ -0,0 +1,53 @@ +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.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; +import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService; +import com.jero.modules.assessmentLibrary.mapper.LawsConformityAssessmentLibraryMapper; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +import static com.jero.modules.laws.common.constant.FieldCommon.STANDARD_NAME; +import static com.jero.modules.laws.common.constant.FieldCommon.STANDARD_NUMBER; + +/** +* @author ThinkBook +* @description 针对表【laws_conformity_assessment_library(法规符合性评估库)】的数据库操作Service实现 +* @createDate 2024-06-24 14:47:19 +*/ +@Service +@Slf4j +public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl + implements ILawsConformityAssessmentLibraryService { + + @Resource + private LawsConformityAssessmentLibraryMapper lawsConformityAssessmentLibraryMapper; + + @Override + public IPage queryPage(LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary, Integer pageNo, Integer pageSize) { + // TODO 数据权限 + QueryWrapper queryWrapper = new QueryWrapper<>(); + Page page = new Page<>(pageNo, pageSize); + queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardNumber()), + STANDARD_NUMBER, lawsConformityAssessmentLibrary.getStandardNumber()); + queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()), + STANDARD_NAME, lawsConformityAssessmentLibrary.getStandardName()); + queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()), + STANDARD_NAME, lawsConformityAssessmentLibrary.getStandardName()); + queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null, + "valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime()); + queryWrapper.orderByDesc("create_time"); + Page result = lawsConformityAssessmentLibraryMapper.queryByPage(page, queryWrapper); + return result; + } +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryDetailServiceImpl.java new file mode 100644 index 00000000..f9287690 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryDetailServiceImpl.java @@ -0,0 +1,24 @@ +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 + implements ILawsEvaluationNotMetLibraryDetailService { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java new file mode 100644 index 00000000..76b2cf98 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java @@ -0,0 +1,24 @@ +package com.jero.modules.assessmentLibrary.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary; +import com.jero.modules.assessmentLibrary.mapper.LawsEvaluationNotMetLibraryMapper; +import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** +* @author ThinkBook +* @description 针对表【laws_evaluation_not_met_library(不符合项库)】的数据库操作Service实现 +* @createDate 2024-06-24 14:48:02 +*/ +@Service +@Slf4j +public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl + implements ILawsEvaluationNotMetLibraryService { + +} + + + + diff --git a/laws-modules/src/main/resources/com/jero/modules/activiti/process/demo/mapper/mapperxml/ProcessDemoMapper.xml b/laws-modules/src/main/resources/com/jero/modules/activiti/process/demo/mapper/mapperxml/ProcessDemoMapper.xml deleted file mode 100644 index b2953f14..00000000 --- a/laws-modules/src/main/resources/com/jero/modules/activiti/process/demo/mapper/mapperxml/ProcessDemoMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - id, create_by, create_time, update_by, update_time, org_code, del_flag - - \ No newline at end of file