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

2023-11-27 16:17:38 +08:00
parent cfc936b2af
commit c61c9ef5be
15 changed files with 260 additions and 145 deletions
@@ -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));
 	}
@@ -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.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 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 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));
+	 }
+
 	/**
 	 *   添加
 	 *
@@ -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;

    /** 稽查依据标准名称 */
@@ -82,4 +82,11 @@ public interface EnterpriseStandardInspectRectifyPlanService extends IService<En
     * @return
     */
    EnterpriseStandardInspectRectifyPlan queryById(String id);
+
+    /**
+     * 企标稽查执行计划-通过企标稽查内容id查询企标稽查执行计划
+     * @param inspectContentId
+     * @return
+     */
+    List<EnterpriseStandardInspectRectifyPlan> queryByInspectContentId(String inspectContentId);
 }
@@ -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));
    }
 	/**
 	 * 保存
@@ -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));
+    }
 }


@@ -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));
    }
 }

@@ -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