fix(企标稽查流程): 问题修复

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java

@@ -98,6 +98,20 @@ public class EsInspectFlowController {
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
+    /**
+     * 企标稽查流程-驳回
+     * @param esInspectFlowVO 企标稽查计划流程VO对象
+     * @return 结果对象
+     */
+    @AutoLog(value = "企标稽查流程-驳回")
+    @ApiOperation(value="企标稽查流程-驳回", notes="企标稽查流程-驳回")
+    @PostMapping(value = "/flowReject")
+    public Result<T> flowReject(@RequestBody EsInspectFlowVO esInspectFlowVO) {
+        log.info("");
+        esInspectFlowService.flowApproval(esInspectFlowVO);
+        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
+    }
+
     /**
      * 企标稽查流程-流程转办
      * @return 结果对象

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java

@@ -3,7 +3,9 @@ package com.jero.modules.activiti.process.esinspect.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.common.util.SnowflakeUtils;
 import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect;
 import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService;
 import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO;
@@ -35,28 +37,29 @@ import java.util.Map;
 @RequestMapping("/esinspect/processEsInspect")
 @Slf4j
 public class ProcessEsInspectController extends JeroController<ProcessEsInspect, IProcessEsInspectService> {
-	private final IProcessEsInspectService processEsInspectService;
+	 private final IProcessEsInspectService processEsInspectService;
 
 	 public ProcessEsInspectController(IProcessEsInspectService processEsInspectService) {
 		 this.processEsInspectService = processEsInspectService;
 	 }
 
 	 /**
-	 * 分页列表查询
+	  * 分页列表查询
-	 *
+	  *
-	 * @param processEsInspectVO
+	  * @param processEsInspectVO
-	 * @param pageNo
+	  * @param pageNo
-	 * @param pageSize
+	  * @param pageSize
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "企标稽查流程业务表-分页列表查询")
+	 @AutoLog(value = "企标稽查流程业务表-分页列表查询")
-	@ApiOperation(value="企标稽查流程业务表-分页列表查询", notes="企标稽查流程业务表-分页列表查询")
+	 @ApiOperation(value="企标稽查流程业务表-分页列表查询", notes="企标稽查流程业务表-分页列表查询")
-	@GetMapping(value = "/queryByPage")
+	 @GetMapping(value = "/queryByPage")
-	public Result<IPage<ProcessEsInspectVO>> queryByPage(ProcessEsInspectVO processEsInspectVO,
+	 @Translation
-														 @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+	 public Result<IPage<ProcessEsInspectVO>> queryByPage(ProcessEsInspectVO processEsInspectVO,
-														 @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+														  @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-		return Result.OK(processEsInspectService.queryByPage(processEsInspectVO, pageNo, pageSize));
+														  @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-	}
+		 return Result.OK(processEsInspectService.queryByPage(processEsInspectVO, pageNo, pageSize));
+	 }
 
     /**
 	 * 列表查询
@@ -67,88 +70,94 @@ public class ProcessEsInspectController extends JeroController<ProcessEsInspect,
 	@AutoLog(value = "企标稽查流程业务表-列表查询")
     @ApiOperation(value="企标稽查流程业务表-列表查询", notes="企标稽查流程业务表-列表查询")
 	@GetMapping(value = "/queryByList")
+	@Translation
 	public Result<List<ProcessEsInspectVO>> queryByList(ProcessEsInspectVO processEsInspectVO) {
         return Result.OK(processEsInspectService.queryByList(processEsInspectVO));
 	}
 
-	/**
+	 /**
-	 *   添加
+	  *   添加
-	 *
+	  *
-	 * @param processEsInspect
+	  * @param processEsInspect
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "企标稽查流程业务表-添加")
+	 @AutoLog(value = "企标稽查流程业务表-添加")
-	@ApiOperation(value="企标稽查流程业务表-添加", notes="企标稽查流程业务表-添加")
+	 @ApiOperation(value="企标稽查流程业务表-添加", notes="企标稽查流程业务表-添加")
-	@PostMapping(value = "/add")
+	 @PostMapping(value = "/add")
-	public Result<T> add(@Validated @RequestBody ProcessEsInspect processEsInspect) {
+	 public Result<T> add(@Validated @RequestBody ProcessEsInspect processEsInspect) {
-		processEsInspectService.add(processEsInspect);
+		 String ids = processEsInspect.getIds();
-		return Result.OK("操作成功!");
+		 for (String s : ids.split(",")) {
-	}
+			 processEsInspect.setInspectId(s);
+			 processEsInspect.setId(String.valueOf(SnowflakeUtils.snowflake()));
+			 processEsInspectService.add(processEsInspect);
+		 }
+		 return Result.OK("操作成功!");
+	 }
 
-	/**
+	 /**
-	 *  编辑
+	  *  编辑
-	 *
+	  *
-	 * @param processEsInspect
+	  * @param processEsInspect
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "企标稽查流程业务表-编辑")
+	 @AutoLog(value = "企标稽查流程业务表-编辑")
-	@ApiOperation(value="企标稽查流程业务表-编辑", notes="企标稽查流程业务表-编辑")
+	 @ApiOperation(value="企标稽查流程业务表-编辑", notes="企标稽查流程业务表-编辑")
-	@PostMapping(value = "/edit")
+	 @PostMapping(value = "/edit")
-	public Result<T> edit(@Validated @RequestBody ProcessEsInspect processEsInspect) {
+	 public Result<T> edit(@Validated @RequestBody ProcessEsInspect processEsInspect) {
-		processEsInspectService.editById(processEsInspect);
+		 processEsInspectService.editById(processEsInspect);
-		return Result.OK("操作成功!");
+		 return Result.OK("操作成功!");
-	}
+	 }
 
-	/**
+	 /**
-	 *   通过id删除
+	  *   通过id删除
-	 *
+	  *
-	 * @param map
+	  * @param map
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "企标稽查流程业务表-通过id删除")
+	 @AutoLog(value = "企标稽查流程业务表-通过id删除")
-	@ApiOperation(value="企标稽查流程业务表-通过id删除", notes="企标稽查流程业务表-通过id删除")
+	 @ApiOperation(value="企标稽查流程业务表-通过id删除", notes="企标稽查流程业务表-通过id删除")
-	@PostMapping(value = "/delete")
+	 @PostMapping(value = "/delete")
-	public Result<T> delete(@RequestBody Map<String, String> map) {
+	 public Result<T> delete(@RequestBody Map<String, String> map) {
-	    if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
+		 if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
             return Result.error("请选择数据!");
         }
-		processEsInspectService.deleteById(map.get("id"));
+		 processEsInspectService.deleteById(map.get("id"));
-		return Result.OK("删除成功!");
+		 return Result.OK("删除成功!");
-	}
+	 }
 
-	/**
+	 /**
-	 *  批量删除
+	  *  批量删除
-	 *
+	  *
-	 * @param map
+	  * @param map
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "企标稽查流程业务表-批量删除")
+	 @AutoLog(value = "企标稽查流程业务表-批量删除")
-	@ApiOperation(value="企标稽查流程业务表-批量删除", notes="企标稽查流程业务表-批量删除")
+	 @ApiOperation(value="企标稽查流程业务表-批量删除", notes="企标稽查流程业务表-批量删除")
-	@PostMapping(value = "/deleteBatch")
+	 @PostMapping(value = "/deleteBatch")
-	public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
+	 public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
         if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
 			return Result.error("请选择数据!");
 		}
-		this.processEsInspectService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
+		 this.processEsInspectService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
-		return Result.OK("批量删除成功!");
+		 return Result.OK("批量删除成功!");
-	}
+	 }
 
-	/**
+	 /**
-	 * 通过id查询
+	  * 通过id查询
-	 *
+	  *
-	 * @param id
+	  * @param id
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "企标稽查流程业务表-通过id查询")
+	 @AutoLog(value = "企标稽查流程业务表-通过id查询")
-	@ApiOperation(value="企标稽查流程业务表-通过id查询", notes="企标稽查流程业务表-通过id查询")
+	 @ApiOperation(value="企标稽查流程业务表-通过id查询", notes="企标稽查流程业务表-通过id查询")
-	@GetMapping(value = "/queryById")
+	 @GetMapping(value = "/queryById")
-	public Result<ProcessEsInspect> queryById(@RequestParam(name="id",required=true) String id) {
+	 public Result<ProcessEsInspect> queryById(@RequestParam(name="id",required=true) String id) {
-		ProcessEsInspect processEsInspect = processEsInspectService.queryById(id);
+		 ProcessEsInspect processEsInspect = processEsInspectService.queryById(id);
-		if(processEsInspect==null) {
+		 if(processEsInspect==null) {
-			return Result.error("未找到对应数据");
+			 return Result.error("未找到对应数据");
-		}
+		 }
-		return Result.OK(processEsInspect);
+		 return Result.OK(processEsInspect);
-	}
+	 }
 
     /**
     * 导出excel

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java

@@ -1,5 +1,6 @@
 package com.jero.modules.activiti.process.esinspect.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.modules.laws.documenttool.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -29,5 +30,10 @@ public class ProcessEsInspect extends BaseEntity {
 	/**企标稽查id*/
 	@Excel(name = "企标稽查id", width = 15)
     @ApiModelProperty(value = "企标稽查id")
-    private java.lang.String inspect;
+    private java.lang.String inspectId;
+
+    /**ids 添加用*/
+    @ApiModelProperty(value = "ids 添加用")
+    @TableField(exist = false)
+    private java.lang.String ids;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml

@@ -11,37 +11,33 @@
     </select>
 
     <sql id="select_process_es_inspect">
-        select pesi.id,
+        select *
-               pesi.create_by,
+        from (select pesi.id,
-               pesi.create_time,
+                     pesi.create_by,
-               pesi.update_by,
+                     pesi.create_time,
-               pesi.update_time,
+                     pesi.update_by,
-               pesi.del_flag,
+                     pesi.update_time,
-               pesi.project_id,
+                     pesi.del_flag,
-               pesi.inspect_id,
+                     pesi.project_id,
-               pesi.complete_date,
+                     pesi.inspect_id,
-               pesi.actual_inspect_user,
+                     pesi.complete_date,
-               lesi.id,
+                     pesi.actual_inspect_user,
-               lesi.create_by,
+                     inspect_no,
-               lesi.create_time,
+                     (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name,
-               lesi.update_by,
+                     standardization_work_group,
-               lesi.update_time,
+                     belong_dept,
-               inspect_no,
+                     plan_inspect_date,
-               (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name,
+                     inspect_user,
-               standardization_work_group,
+                     standardization_docking_user,
-               belong_dept,
+                     inspect_status,
-               plan_inspect_date,
+                     group_concat(lesio.plan_inspect_object separator ',')                  plan_inspect_object,
-               inspect_user,
+                     COUNT(lenstic.id)                                                       standard_inspect_content_count
-               standardization_docking_user,
+              from process_es_inspect pesi
-               complete_date,
+                       left join laws_enterprise_standard_inspect lesi on pesi.inspect_id = lesi.id
-               actual_inspect_user,
+                       left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0'
-               inspect_status,
+                       left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id
-               group_concat(lesio.plan_inspect_object separator ',')                  plan_inspect_object
+                       left join laws_enterprise_standard_inspect_content lenstic ON pesi.id = lenstic.process_es_inspect_id
-        from process_es_inspect pesi
+              group by pesi.id) t
-                 left join laws_enterprise_standard_inspect lesi on pesi.inspect_id = lesi.id
-                 left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0'
-                 left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id
             ${ew.customSqlSegment}
-        group by lesi.id
     </sql>
 </mapper>

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java

@@ -12,6 +12,7 @@ import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.esinspect.common.EsInspectCommon;
+import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect;
 import com.jero.modules.activiti.process.esinspect.service.IEsInspectFlowService;
 import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService;
 import com.jero.modules.activiti.process.esinspect.vo.EsInspectFlowVO;
@@ -19,6 +20,7 @@ import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO;
 import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
+import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport;
@@ -137,12 +139,26 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
         // 自动完成第一个节点
         taskService.complete(task.getId());
 
+        // 更新企标稽查状态
+        updateLawsEnterpriseStandardStatus(processAll.getProjectId());
+
         // 删除草稿
         processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
                 .eq(ProcessDraft::getProjectId, processAll.getProjectId())
                 .eq(ProcessDraft::getUserId, loginUser.getId()));
     }
 
+    private void updateLawsEnterpriseStandardStatus(String projectId) {
+        List<ProcessEsInspect> list = processEsInspectService.list(
+                new LambdaQueryWrapper<ProcessEsInspect>()
+                        .eq(ProcessEsInspect::getProjectId, projectId));
+        List<String> processIds = list.stream().map(ProcessEsInspect::getInspectId).collect(Collectors.toList());
+        enterpriseStandardInspectService.update(
+                new LambdaUpdateWrapper<EnterpriseStandardInspect>()
+                        .in(EnterpriseStandardInspect::getId, processIds)
+                        .set(EnterpriseStandardInspect::getInspectStatus, EsInspectCommon.INSPECT_STATUS_2));
+    }
+
     private Map<String, Object> listToString(Map<String, Object> map) {
         Map<String, Object> stringObjectHashMap;
         stringObjectHashMap = map.entrySet().stream().map(v -> {

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java

@@ -1,11 +1,15 @@
 package com.jero.modules.activiti.process.esinspect.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.common.util.SnowflakeUtils;
 import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect;
 import com.jero.modules.activiti.process.esinspect.mapper.ProcessEsInspectMapper;
 import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService;
@@ -13,6 +17,7 @@ import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService;
+import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
@@ -37,15 +42,18 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl<ProcessEsInspectMap
 	private final EnterpriseStandardInspectContentService enterpriseStandardInspectContentService;
 	private final EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService;
 	private final EnterpriseStandardInspectReportService enterpriseStandardInspectReportService;
+	private final ISysUserService sysUserService;
 
 	public ProcessEsInspectServiceImpl(ProcessEsInspectMapper processEsInspectMapper,
 									   EnterpriseStandardInspectContentService enterpriseStandardInspectContentService,
 									   EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService,
-									   EnterpriseStandardInspectReportService enterpriseStandardInspectReportService) {
+									   EnterpriseStandardInspectReportService enterpriseStandardInspectReportService,
+									   ISysUserService sysUserService) {
 		this.processEsInspectMapper = processEsInspectMapper;
 		this.enterpriseStandardInspectContentService = enterpriseStandardInspectContentService;
 		this.enterpriseStandardInspectRectifyPlanService = enterpriseStandardInspectRectifyPlanService;
 		this.enterpriseStandardInspectReportService = enterpriseStandardInspectReportService;
+		this.sysUserService = sysUserService;
 	}
 
 
@@ -86,10 +94,23 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl<ProcessEsInspectMap
 	 */
 	@Override
     public void add(ProcessEsInspect processEsInspect) {
-        Date now = new Date();
+		String ids = processEsInspect.getIds();
-        processEsInspect.setCreateTime(now);
+		for (String s : ids.split(",")) {
-        processEsInspect.setUpdateTime(now);
+			int count = count(
-        save(processEsInspect);
+					new LambdaQueryWrapper<ProcessEsInspect>()
+					.eq(ProcessEsInspect::getInspectId, s)
+					.eq(ProcessEsInspect::getProjectId, processEsInspect.getProjectId()));
+			if (count > 0) {
+				if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())){
+					throw new JeroBootException("不能重复添加!");
+				}else {
+					throw new JeroBootException("Cannot repeat add!");
+				}
+			}
+			processEsInspect.setInspectId(s);
+			processEsInspect.setId(String.valueOf(SnowflakeUtils.snowflake()));
+			save(processEsInspect);
+		}
     }
 
 	/**
@@ -141,7 +162,15 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl<ProcessEsInspectMap
 	@Override
 	public IPage<ProcessEsInspectVO> queryByPage(ProcessEsInspectVO processEsInspectVO, Integer pageNo, Integer pageSize) {
 		QueryWrapper<ProcessEsInspectVO> queryWrapper = getProcessEsInspectVOQueryWrapper(processEsInspectVO);
-		return processEsInspectMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper);
+		IPage<ProcessEsInspectVO> processEsInspectVOIPage = processEsInspectMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper);
+		setProperty(processEsInspectVOIPage);
+		return processEsInspectVOIPage;
+	}
+
+	private void setProperty(IPage<ProcessEsInspectVO> processEsInspectVOIPage) {
+		for (ProcessEsInspectVO processEsInspectVO : processEsInspectVOIPage.getRecords()) {
+			processEsInspectVO.setInspectUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectVO.getInspectUser(), ""));
+		}
 	}
 
 	@Override
@@ -153,9 +182,9 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl<ProcessEsInspectMap
 	@NotNull
 	private static QueryWrapper<ProcessEsInspectVO> getProcessEsInspectVOQueryWrapper(ProcessEsInspectVO processEsInspectVO) {
 		QueryWrapper<ProcessEsInspectVO> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq(StringUtils.isNotBlank(processEsInspectVO.getProjectId()), "pesi.project_id", processEsInspectVO.getProjectId());
+		queryWrapper.eq(StringUtils.isNotBlank(processEsInspectVO.getProjectId()), "t.project_id", processEsInspectVO.getProjectId());
-		queryWrapper.eq("pesi.del_flag", 0);
+		queryWrapper.eq("t.del_flag", 0);
-		queryWrapper.orderByDesc("pesi.create_time");
+		queryWrapper.orderByDesc("t.create_time");
 		return queryWrapper;
 	}
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java

@@ -32,4 +32,11 @@ public class ProcessEsInspectVO extends EnterpriseStandardInspectVo {
     @Excel(name = "实际稽查人", width = 15)
     @ApiModelProperty(value = "实际稽查人")
     private java.lang.String actualInspectUser;
+    /**稽查内容数量*/
+    @ApiModelProperty(value = "稽查内容数量")
+    private java.lang.String standardInspectContentCount;
+
+    /** 稽查负责人 翻译*/
+    @ApiModelProperty(value = "稽查负责人 翻译")
+    private String inspectUserDictText;
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java

@@ -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.EnterpriseStandardInspect;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay;
@@ -78,6 +79,7 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
 	@AutoLog(value = "企标稽查-分页列表查询2")
 	@ApiOperation(value="企标稽查-分页列表查询2", notes="企标稽查-分页列表查询2")
 	@GetMapping(value = "/queryByPage")
+	@Translation
 	public Result<IPage<EnterpriseStandardInspectVo>> queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo,
 								 @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1")  Integer pageNo,
 								 @ApiParam("每页条数")  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
@@ -93,6 +95,7 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
 	@AutoLog(value = "企标稽查-列表查询2")
 	@ApiOperation(value="企标稽查-列表查询2", notes="企标稽查-列表查询2")
 	@GetMapping(value = "/queryByList")
+	@Translation
 	public Result<List<EnterpriseStandardInspectVo>> queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) {
 		return Result.OK(esInspectService.queryByList(enterpriseStandardInspectVo));
 	}

laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectRectifyPlanController.java

@@ -1,25 +1,27 @@
 package com.jero.modules.laws.enterprise.controller;
 
-import java.util.Arrays;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 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.EnterpriseStandardInspectRectifyPlan;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService;
-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 javax.servlet.http.HttpServletRequest;
-import com.jero.common.aspect.annotation.AutoLog;
+import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.StringUtils;
+import java.util.Arrays;
-import org.apache.poi.ss.formula.functions.T;
+import java.util.List;
+import java.util.Map;
 
 
  /**
@@ -71,6 +73,19 @@ public class EnterpriseStandardInspectRectifyPlanController extends JeroControll
         return Result.OK(list);
 	}
 
+	 /**
+	  * 企标稽查执行计划-通过企标稽查内容id查询企标稽查执行计划
+	  *
+	  * @param inspectContentId
+	  * @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));
+	 }
+
 	/**
 	 *   添加
 	 *

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java

@@ -29,6 +29,7 @@ public class EnterpriseStandardInspectVo {
     /** 计划稽查对象 */
     @Excel(name = "计划稽查对象", width = 15, orderNum = "1")
     @ApiModelProperty(value = "计划稽查对象")
+    @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
     private String planInspectObject;
 
     /** 稽查依据标准名称 */

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectRectifyPlanService.java

@@ -82,4 +82,11 @@ public interface EnterpriseStandardInspectRectifyPlanService extends IService<En
      * @return
      */
     EnterpriseStandardInspectRectifyPlan queryById(String id);
+
+    /**
+     * 企标稽查执行计划-通过企标稽查内容id查询企标稽查执行计划
+     * @param inspectContentId
+     * @return
+     */
+    List<EnterpriseStandardInspectRectifyPlan> queryByInspectContentId(String inspectContentId);
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectContentServiceImpl.java

@@ -60,7 +60,8 @@ public class EnterpriseStandardInspectContentServiceImpl extends ServiceImpl<Ent
     @Override
     public List<EnterpriseStandardInspectContent> queryClauseByEsInspectId(String processEsInspectId) {
         return list(new LambdaQueryWrapper<EnterpriseStandardInspectContent>()
-                        .eq(EnterpriseStandardInspectContent::getProcessEsInspectId, processEsInspectId));
+                        .eq(EnterpriseStandardInspectContent::getProcessEsInspectId, processEsInspectId)
+						.orderByDesc(EnterpriseStandardInspectContent::getCreateTime));
     }
 	/**
 	 * 保存

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java

@@ -1,5 +1,6 @@
 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;
@@ -7,11 +8,9 @@ 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.common.system.vo.DictModel;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan;
-import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo;
-import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService;
 import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectRectifyPlanMapper;
+import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,7 +19,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
 * @author ThinkBook
@@ -134,6 +132,13 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl
     public EnterpriseStandardInspectRectifyPlan queryById(String id) {
         return getById(id);
     }
+
+    @Override
+    public List<EnterpriseStandardInspectRectifyPlan> queryByInspectContentId(String inspectContentId) {
+        return list(new LambdaQueryWrapper<EnterpriseStandardInspectRectifyPlan>()
+                .eq(EnterpriseStandardInspectRectifyPlan::getProcessEsInspectId, inspectContentId)
+                .orderByAsc(EnterpriseStandardInspectRectifyPlan::getCreateTime));
+    }
 }
 
 

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java

@@ -155,7 +155,8 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
     @Override
     public List<EnterpriseStandardInspectReport> queryByInspectContentId(String inspectContentId) {
         return list(new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
-               .eq(EnterpriseStandardInspectReport::getInspectContentId, inspectContentId));
+               .eq(EnterpriseStandardInspectReport::getInspectContentId, inspectContentId)
+                .orderByDesc(EnterpriseStandardInspectReport::getCreateTime));
     }
 }
 

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java

@@ -13,6 +13,7 @@ import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo;
 import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectMapper;
 import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectRectifyPlanMapper;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService;
+import com.jero.modules.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -49,6 +50,9 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
     @Resource
     private EnterpriseStandardInspectRectifyPlanMapper esInspectRectifyPlanMapper;
 
+    @Resource
+    private ISysUserService sysUserService;
+
     @Override
     public IPage<EnterpriseStandardInspectVo> queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize) {
         IPage<EnterpriseStandardInspectVo> page = new Page<>(pageNo, pageSize);
@@ -179,7 +183,8 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
     @Override
     public List<EnterpriseStandardInspectVo> queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) {
         QueryWrapper<EnterpriseStandardInspectVo> queryWrapper = getEnterpriseStandardInspectVoQueryWrapper(enterpriseStandardInspectVo);
-        return esInspectMapper.queryByList(queryWrapper);
+        List<EnterpriseStandardInspectVo> enterpriseStandardInspectVos = esInspectMapper.queryByList(queryWrapper);
+        return enterpriseStandardInspectVos;
     }
 
     @NotNull