ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(稽查延期申请流程): 基础模块

Browse Source
This commit is contained in:
yjz
2023-11-28 16:21:34 +08:00
parent e8b97877a5
commit c932d59901
26 changed files with 1295 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectRectifyPlanController.java
+9 -7
View File
@@ -3,6 +3,7 @@ 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.aspect.annotation.Translation;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService;
@@ -74,16 +75,17 @@ public class EnterpriseStandardInspectRectifyPlanController extends JeroControll
}
/**
* 企标稽查执行计划-通过企标稽查内容id查询企标稽查执行计划
* 企标稽查执行计划-通过企标稽查流程id查询企标稽查执行计划
*
* @param inspectContentId
* @param processEsInspectId
* @return
*/
@AutoLog(value = "企标稽查执行计划-通过企标稽查内容id查询企标稽查执行计划")
@ApiOperation(value="企标稽查执行计划-通过企标稽查内容id查询企标稽查执行计划", notes="企标稽查执行计划-通过企标稽查内容id查询企标稽查执行计划")
@GetMapping(value = "/queryByInspectContentId")
public Result<List<EnterpriseStandardInspectRectifyPlan>> queryByInspectContentId(@ApiParam("企标稽查内容id") String inspectContentId) {
return Result.OK(enterpriseStandardInspectRectifyPlanService.queryByInspectContentId(inspectContentId));
@AutoLog(value = "企标稽查执行计划-通过企标稽查流程id查询企标稽查执行计划")
@ApiOperation(value="企标稽查执行计划-通过企标稽查流程id查询企标稽查执行计划", notes="企标稽查执行计划-通过企标稽查流程id查询企标稽查执行计划")
@GetMapping(value = "/queryByProcessEsInspectId")
@Translation
public Result<List<EnterpriseStandardInspectRectifyPlan>> queryByProcessEsInspectId(@ApiParam("企标稽查流程id") String processEsInspectId) {
return Result.OK(enterpriseStandardInspectRectifyPlanService.queryByProcessEsInspectId(processEsInspectId));
}
/**
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectReportController.java
+14 -1
View File
@@ -82,10 +82,23 @@ public class EnterpriseStandardInspectReportController extends JeroController<En
@AutoLog(value = "企标稽查报告-通过企标稽查内容id查询企标稽查报告")
@ApiOperation(value="企标稽查报告-通过企标稽查内容id查询企标稽查报告", notes="企标稽查报告-通过企标稽查内容id查询企标稽查报告")
@GetMapping(value = "/queryByInspectContentId")
public Result<List<EnterpriseStandardInspectReport>> queryByInspectContentId(@ApiParam("企标稽查内容id") String inspectContentId) {
public Result<EnterpriseStandardInspectReport> queryByInspectContentId(@ApiParam("企标稽查内容id") String inspectContentId) {
return Result.OK(EnterpriseStandardInspectReportService.queryByInspectContentId(inspectContentId));
}
/**
* 企标稽查报告-通过企标稽查流程id查询稽查报告
*
* @param processEsInspectId
* @return
*/
@AutoLog(value = "企标稽查报告-通过企标稽查流程id查询稽查报告")
@ApiOperation(value="企标稽查报告-通过企标稽查流程id查询稽查报告", notes="企标稽查报告-通过企标稽查流程id查询稽查报告")
@GetMapping(value = "/queryByProcessEsInspectId")
public Result<List<EnterpriseStandardInspectReport>> queryByProcessEsInspectId(@ApiParam("企标稽查流程id") String processEsInspectId) {
return Result.OK(EnterpriseStandardInspectReportService.queryByProcessEsInspectId(processEsInspectId));
}
/**
* 添加
*
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java
+40 -4
View File
@@ -4,6 +4,7 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -11,6 +12,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -68,6 +70,13 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable {
@ApiModelProperty(value = "稽查id")
private String inspectId;
/**
* 是否需要整改(1是0否)
*/
@ApiModelProperty(value = "是否需要整改(1是0否)")
@Dict(dicCode = "yn")
private String isRectify;
/**
* 存在问题
*/
@@ -87,13 +96,31 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable {
*/
@Excel(name = "整改负责人", width = 15, orderNum = "1")
@ApiModelProperty(value = "整改负责人")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String responseUser;
/**
* 整改负责人 翻译
*/
@ApiModelProperty(value = "整改负责人 翻译")
@TableField(exist = false)
private String responseUserDictText;
/**
* 整改单位
*/
@Excel(name = "整改单位", width = 15, orderNum = "1")
@ApiModelProperty(value = "整改单位")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private String responseDepart;
/**
* 整改计划完成时间
*/
@Excel(name = "整改计划完成时间", width = 15, orderNum = "1", format = "yyyy-MM-dd hh:mm:ss")
@ApiModelProperty(value = "整改计划完成时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date planCompleteDate;
/**
@@ -101,6 +128,8 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable {
*/
@Excel(name = "整改实际完成时间", width = 15, orderNum = "1", format = "yyyy-MM-dd hh:mm:ss")
@ApiModelProperty(value = "整改实际完成时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date actualCompleteDate;
/**
@@ -111,14 +140,21 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable {
@ApiModelProperty(value = "整改状态")
private String rectifyStatus;
/** 企标稽查报告id */
@ApiModelProperty(value = "企标稽查报告id")
private String inspectReportId;
/** 企标稽查流程id */
@ApiModelProperty(value = "企标稽查流程id")
private String processEsInspectId;
/** 企标稽查内容id */
@ApiModelProperty(value = "企标稽查内容id")
private String inspectContentId;
@TableField(exist = false)
private static final long serialVersionUID = 1980978879087908791L;
/**
* 稽查报告
*/
@TableField(exist = false)
@ApiModelProperty(value = "稽查报告")
private EnterpriseStandardInspectReport enterpriseStandardInspectReport;
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java
+5
View File
@@ -79,6 +79,11 @@ public class EnterpriseStandardInspectReport implements Serializable {
@ApiModelProperty(value = "附件")
private String attachment;
/**附件名*/
@ApiModelProperty(value = "附件名")
@TableField(exist = false)
private String attachmentName;
/** 企标稽查流程id */
@ApiModelProperty(value = "企标稽查流程id")
private String processEsInspectId;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectRectifyPlanService.java
+7
View File
@@ -89,4 +89,11 @@ public interface EnterpriseStandardInspectRectifyPlanService extends IService<En
* @return
*/
List<EnterpriseStandardInspectRectifyPlan> queryByInspectContentId(String inspectContentId);
/**
* 企标稽查执行计划-通过企标稽查流程id查询企标稽查执行计划
* @param processEsInspectId
* @return
*/
List<EnterpriseStandardInspectRectifyPlan> queryByProcessEsInspectId(String processEsInspectId);
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java
+9 -2
View File
@@ -85,9 +85,16 @@ public interface EnterpriseStandardInspectReportService extends IService<Enterpr
EnterpriseStandardInspectReport queryById(String id);
/**
* 企标稽查报告-通过企标稽查内容id查询企标稽查报告
*
* @param inspectContentId
* @return
*/
List<EnterpriseStandardInspectReport> queryByInspectContentId(String inspectContentId);
EnterpriseStandardInspectReport queryByInspectContentId(String inspectContentId);
/**
*
* @param processEsInspectId
* @return
*/
List<EnterpriseStandardInspectReport> queryByProcessEsInspectId(String processEsInspectId);
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java
+32
View File
@@ -8,9 +8,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport;
import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectRectifyPlanMapper;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService;
import com.jero.modules.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,6 +41,15 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl
@Resource
private EnterpriseStandardInspectRectifyPlanMapper esInspectRectifyPlanMapper;
@Resource
private com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService EnterpriseStandardInspectReportService;
@Resource
private ISysUserService sysUserService;
@Resource
private EnterpriseStandardInspectContentService enterpriseStandardInspectContentService;
@Override
public IPage<EnterpriseStandardInspectRectifyPlan> getRectifyPlan(String inspectId, Integer pageNo, Integer pageSize) {
IPage<EnterpriseStandardInspectRectifyPlan> page = new Page<>(pageNo, pageSize);
@@ -139,6 +152,25 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl
.eq(EnterpriseStandardInspectRectifyPlan::getProcessEsInspectId, inspectContentId)
.orderByAsc(EnterpriseStandardInspectRectifyPlan::getCreateTime));
}
@Override
public List<EnterpriseStandardInspectRectifyPlan> queryByProcessEsInspectId(String processEsInspectId) {
List<EnterpriseStandardInspectRectifyPlan> list = list(new LambdaQueryWrapper<EnterpriseStandardInspectRectifyPlan>()
.eq(EnterpriseStandardInspectRectifyPlan::getProcessEsInspectId, processEsInspectId)
.orderByAsc(EnterpriseStandardInspectRectifyPlan::getCreateTime));
list.forEach(item -> {
// 填充稽查报告
EnterpriseStandardInspectReport enterpriseStandardInspectReport = EnterpriseStandardInspectReportService.getById(item.getInspectReportId());
// 稽查内容查询
EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo());
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
item.setEnterpriseStandardInspectReport(enterpriseStandardInspectReport);
// 翻译
item.setResponseUserDictText(sysUserService.dictByIdsOrUserNames(item.getResponseUser(), ""));
});
return list;
}
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java
+32 -3
View File
@@ -9,9 +9,12 @@ 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.EnterpriseStandardInspectContent;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport;
import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectReportMapper;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService;
import com.jero.modules.oss.service.IOSSFileService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +38,12 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
@Resource
private EnterpriseStandardInspectReportMapper esInspectReportMapper;
@Resource
private EnterpriseStandardInspectContentService enterpriseStandardInspectContentService;
@Resource
private IOSSFileService ossFileService;
@Override
public IPage<EnterpriseStandardInspectReport> getInspectReport(String inspectId, Integer pageNo, Integer pageSize) {
IPage<EnterpriseStandardInspectReport> page = new Page<>(pageNo, pageSize);
@@ -153,10 +162,30 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
}
@Override
public List<EnterpriseStandardInspectReport> queryByInspectContentId(String inspectContentId) {
return list(new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
.eq(EnterpriseStandardInspectReport::getInspectContentId, inspectContentId)
public EnterpriseStandardInspectReport queryByInspectContentId(String inspectContentId) {
EnterpriseStandardInspectReport enterpriseStandardInspectReport = getOne(new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
.eq(EnterpriseStandardInspectReport::getInspectContentId, inspectContentId)
.orderByDesc(EnterpriseStandardInspectReport::getCreateTime));
// 稽查内容查询
EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo());
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
return enterpriseStandardInspectReport;
}
@Override
public List<EnterpriseStandardInspectReport> queryByProcessEsInspectId(String processEsInspectId) {
List<EnterpriseStandardInspectReport> list = list(new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
.eq(EnterpriseStandardInspectReport::getProcessEsInspectId, processEsInspectId)
.orderByDesc(EnterpriseStandardInspectReport::getCreateTime));
for (EnterpriseStandardInspectReport enterpriseStandardInspectReport : list) {
// 稽查内容查询
EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo());
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
}
return list;
}
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
+6 -1
View File
@@ -195,7 +195,12 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
List<String> list = Arrays.asList(enterpriseStandardInspectVo.getIds().split(","));
queryWrapper.in("id", list);
}
queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectStatus()), "inspect_status", enterpriseStandardInspectVo.getInspectStatus());
String inspectStatus = enterpriseStandardInspectVo.getInspectStatus();
if (StringUtils.isNotBlank(inspectStatus)){
List<String> list = Arrays.asList(inspectStatus.split(","));
queryWrapper.and(qw -> list.forEach(v -> qw.or(iqw -> iqw.eq("inspect_status", v))));
}
queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectUser()), "inspect_user", enterpriseStandardInspectVo.getInspectUser());
queryWrapper.orderByDesc("create_time");
return queryWrapper;
}