feat(企标稽查流程): 基础功能

2023-11-24 14:24:28 +08:00
parent 7d792a5fd0
commit 7913613e44
16 changed files with 362 additions and 64 deletions
@@ -1,24 +1,25 @@
 package com.jero.modules.laws.enterprise.controller;

-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
 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.EnterpriseStandardInspectContent;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.jero.common.aspect.annotation.AutoLog;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;


 /**
@@ -71,7 +72,20 @@ public class EnterpriseStandardInspectContentController extends JeroController<E
        return Result.OK(list);
 	}

-	/**
+	 /**
+	  * 列表查询
+	  *
+	  * @param processEsInspectId
+	  * @return
+	  */
+	 @AutoLog(value = "企标稽查内容-通过企标稽查流程id查询稽查内容")
+	 @ApiOperation(value="企标稽查内容-通过企标稽查流程id查询稽查内容", notes="企标稽查内容-通过企标稽查流程id查询稽查内容")
+	 @GetMapping(value = "/queryClauseByEsInspectId")
+	 public Result<List<EnterpriseStandardInspectContent>> queryList(@ApiParam("企标稽查流程id") String processEsInspectId) {
+		 return Result.OK(enterpriseStandardInspectContentService.queryClauseByEsInspectId(processEsInspectId));
+	 }
+
+	 /**
 	 *   添加
 	 *
 	 * @param enterpriseStandardInspectContent
@@ -1,25 +1,27 @@
 package com.jero.modules.laws.enterprise.controller;

-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+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.EnterpriseStandardInspectReport;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 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.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.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;


 /**
@@ -71,6 +73,19 @@ public class EnterpriseStandardInspectReportController extends JeroController<En
        return Result.OK(list);
 	}

+	 /**
+	  * 企标稽查报告-通过企标稽查内容id查询企标稽查报告
+	  *
+	  * @param inspectContentId
+	  * @return
+	  */
+	 @AutoLog(value = "企标稽查报告-通过企标稽查内容id查询企标稽查报告")
+	 @ApiOperation(value="企标稽查报告-通过企标稽查内容id查询企标稽查报告", notes="企标稽查报告-通过企标稽查内容id查询企标稽查报告")
+	 @GetMapping(value = "/queryByInspectContentId")
+	 public Result<List<EnterpriseStandardInspectReport>> queryByInspectContentId(@ApiParam("企标稽查内容id") String inspectContentId) {
+		 return Result.OK(EnterpriseStandardInspectReportService.queryByInspectContentId(inspectContentId));
+	 }
+
 	/**
 	 *   添加
 	 *
@@ -87,6 +87,11 @@ public class EnterpriseStandardInspectContent implements Serializable {
    @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
    private String rectificationDepartment;

+    /** 企标稽查流程id */
+    @ApiModelProperty(value = "企标稽查流程id")
+    private String processEsInspectId;
+
+
    @JSONField(name = "rectificationDepartment_dictText")
    @TableField(exist = false)
    @ApiModelProperty(value = "整改部门手动翻译字段")
@@ -4,9 +4,6 @@ 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 com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,6 +12,9 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;

+import java.io.Serializable;
+import java.util.Date;
+
 /**
 * 
 * @TableName laws_enterprise_standard_inspect_rectify_plan
@@ -111,6 +111,14 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable {
    @ApiModelProperty(value = "整改状态")
    private String rectifyStatus;

+    /** 企标稽查流程id */
+    @ApiModelProperty(value = "企标稽查流程id")
+    private String processEsInspectId;
+
+    /** 企标稽查内容id */
+    @ApiModelProperty(value = "企标稽查内容id")
+    private String inspectContentId;
+
    @TableField(exist = false)
    private static final long serialVersionUID = 1980978879087908791L;
 }
@@ -79,6 +79,14 @@ public class EnterpriseStandardInspectReport implements Serializable {
    @ApiModelProperty(value = "附件")
    private String attachment;

+    /** 企标稽查流程id */
+    @ApiModelProperty(value = "企标稽查流程id")
+    private String processEsInspectId;
+
+    /** 企标稽查内容id */
+    @ApiModelProperty(value = "企标稽查内容id")
+    private String inspectContentId;
+
    /**依据条款*/
    @TableField(exist = false)
    @ApiModelProperty(value = "依据条款")
@@ -1,8 +1,8 @@
 package com.jero.modules.laws.enterprise.service;

 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent;

 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -14,6 +14,12 @@ import java.util.List;
 */
 public interface EnterpriseStandardInspectContentService extends IService<EnterpriseStandardInspectContent> {

+    /**
+     * 企标稽查内容-通过企标稽查流程id查询稽查内容
+     * @param processEsInspectId
+     * @return
+     */
+    List<EnterpriseStandardInspectContent> queryClauseByEsInspectId(String processEsInspectId);
    /**
     * 分页查询
     *
@@ -83,4 +83,11 @@ public interface EnterpriseStandardInspectReportService extends IService<Enterpr
     * @return
     */
    EnterpriseStandardInspectReport queryById(String id);
+
+    /**
+     * 企标稽查报告-通过企标稽查内容id查询企标稽查报告
+     * @param inspectContentId
+     * @return
+     */
+    List<EnterpriseStandardInspectReport> queryByInspectContentId(String inspectContentId);
 }
@@ -1,20 +1,21 @@
 package com.jero.modules.laws.enterprise.service.impl;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent;
 import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectContentMapper;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.jero.common.exception.JeroBootException;
-import java.util.List;
-import java.util.Date;
-import com.jero.common.system.query.QueryGenerator;
-import javax.servlet.http.HttpServletRequest;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;

 /**
 * @Description: 企标稽查内容
@@ -56,6 +57,11 @@ public class EnterpriseStandardInspectContentServiceImpl extends ServiceImpl<Ent
        return list(QueryGenerator.initQueryWrapper(enterpriseStandardInspectContent, req.getParameterMap()));
    }

+    @Override
+    public List<EnterpriseStandardInspectContent> queryClauseByEsInspectId(String processEsInspectId) {
+        return list(new LambdaQueryWrapper<EnterpriseStandardInspectContent>()
+                        .eq(EnterpriseStandardInspectContent::getProcessEsInspectId, processEsInspectId));
+    }
 	/**
 	 * 保存
 	 *
@@ -64,6 +70,7 @@ public class EnterpriseStandardInspectContentServiceImpl extends ServiceImpl<Ent
 	 */
 	@Override
    public void add(EnterpriseStandardInspectContent enterpriseStandardInspectContent) {
+		// 唯一校验
        Date now = new Date();
        enterpriseStandardInspectContent.setCreateTime(now);
        enterpriseStandardInspectContent.setUpdateTime(now);
@@ -1,15 +1,17 @@
 package com.jero.modules.laws.enterprise.service.impl;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.constant.enums.LanguageEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport;
-import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo;
-import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService;
 import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectReportMapper;
+import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -72,28 +74,49 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
    /**
     * 保存
     *
-     * @param EnterpriseStandardInspectReport
+     * @param enterpriseStandardInspectReport
     * @return
     */
    @Override
-    public void add(EnterpriseStandardInspectReport EnterpriseStandardInspectReport) {
+    public void add(EnterpriseStandardInspectReport enterpriseStandardInspectReport) {
+        // 企标稽查内容唯一性校验
+        int count = count(new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
+                .eq(EnterpriseStandardInspectReport::getInspectContentId, enterpriseStandardInspectReport.getInspectContentId()));
+        if (count > 0){
+            if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())){
+                throw new JeroBootException("该章节条款已存在!");
+            }else {
+                throw new JeroBootException("This section clause already exists!");
+            }
+        }
        Date now = new Date();
-        EnterpriseStandardInspectReport.setCreateTime(now);
-        EnterpriseStandardInspectReport.setUpdateTime(now);
-        save(EnterpriseStandardInspectReport);
+        enterpriseStandardInspectReport.setCreateTime(now);
+        enterpriseStandardInspectReport.setUpdateTime(now);
+        save(enterpriseStandardInspectReport);
    }

    /**
     * 更新
     *
-     * @param EnterpriseStandardInspectReport
+     * @param enterpriseStandardInspectReport
     * @return
     */
    @Override
-    public void editById(EnterpriseStandardInspectReport EnterpriseStandardInspectReport) {
+    public void editById(EnterpriseStandardInspectReport enterpriseStandardInspectReport) {
+        // 企标稽查内容唯一性校验
+        int count = count(new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
+                .eq(EnterpriseStandardInspectReport::getInspectContentId, enterpriseStandardInspectReport.getInspectContentId())
+                .ne(EnterpriseStandardInspectReport::getId, enterpriseStandardInspectReport.getId()));
+        if (count > 0){
+            if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())){
+                throw new JeroBootException("该章节条款已存在!");
+            }else {
+                throw new JeroBootException("This section clause already exists!");
+            }
+        }
        Date now = new Date();
-        EnterpriseStandardInspectReport.setUpdateTime(now);
-        saveOrUpdate(EnterpriseStandardInspectReport);
+        enterpriseStandardInspectReport.setUpdateTime(now);
+        saveOrUpdate(enterpriseStandardInspectReport);
    }

    /**
@@ -128,6 +151,12 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
    public EnterpriseStandardInspectReport queryById(String id) {
        return getById(id);
    }
+
+    @Override
+    public List<EnterpriseStandardInspectReport> queryByInspectContentId(String inspectContentId) {
+        return list(new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
+               .eq(EnterpriseStandardInspectReport::getInspectContentId, inspectContentId));
+    }
 }