From c5b2ccf545256a92ac95b44ff85c13baa5261aec Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 23 Nov 2023 13:41:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 295aaaadfed221177f34786230c0530a5c45e42e) --- .../controller/EsInspectFlowController.java | 112 +++++++++++ .../ProcessEsInspectController.java | 177 ++++++++++++++++++ .../esinspect/entity/ProcessEsInspect.java | 33 ++++ .../mapper/ProcessEsInspectMapper.java | 35 ++++ .../mapper/xml/ProcessEsInspectMapper.xml | 45 +++++ .../service/IEsInspectFlowService.java | 46 +++++ .../service/IProcessEsInspectService.java | 94 ++++++++++ .../impl/EsInspectFlowServiceImpl.java | 38 ++++ .../impl/ProcessEsInspectServiceImpl.java | 149 +++++++++++++++ .../process/esinspect/vo/EsInspectFlowVO.java | 33 ++++ .../esinspect/vo/ProcessEsInspectVO.java | 25 +++ .../common/EsInspectPlanCommon.java | 17 ++ .../entity/ProcessEsInspectPlan.java | 5 +- .../impl/EsInspectPlanFlowServiceImpl.java | 57 +++--- .../impl/ProcessEsInspectPlanServiceImpl.java | 21 ++- .../EnterpriseStandardInspectController.java | 28 +++ .../vo/EnterpriseStandardInspectVo.java | 10 + .../EnterpriseStandardInspectMapper.java | 20 ++ .../xml/EnterpriseStandardInspectMapper.xml | 34 ++++ .../EnterpriseStandardInspectService.java | 17 ++ .../EnterpriseStandardInspectServiceImpl.java | 43 +++-- 21 files changed, 990 insertions(+), 49 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/ProcessEsInspectMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IEsInspectFlowService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java new file mode 100644 index 00000000..b4b66d5e --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java @@ -0,0 +1,112 @@ +package com.jero.modules.activiti.process.esinspect.controller; + +import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; +import com.jero.common.util.MessageUtils; +import com.jero.common.util.SnowflakeUtils; +import com.jero.modules.activiti.process.esinspect.service.IEsInspectFlowService; +import com.jero.modules.activiti.process.esinspect.vo.EsInspectFlowVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.context.annotation.Lazy; +import org.springframework.web.bind.annotation.*; + +/** + * @ClassName: EsInspectFlowController + * @Description: + * @Author: yjz + * @Date: 2023-11-23 09:22 + * @Version: 1.0 + **/ +@Api(tags="企标稽查流程") +@RestController +@RequestMapping("/esinspect/esInspectFlowController") +@Slf4j +public class EsInspectFlowController { + private final IEsInspectFlowService esInspectFlowService; + + public EsInspectFlowController(@Lazy IEsInspectFlowService esInspectFlowService) { + this.esInspectFlowService = esInspectFlowService; + } + + /** + * 企标稽查流程-生成项目id + * @return 项目id + */ + @AutoLog(value = "企标稽查流程-生成项目id") + @ApiOperation(value="企标稽查流程-生成项目id", notes="企标稽查流程-生成项目id") + @GetMapping(value = "/getProjectId") + public String getProjectId() { + return String.valueOf(SnowflakeUtils.snowflake()); + } + + /** + * 企标稽查流程-流程发起 + * @param esInspectFlowVO 企标稽查流程VO对象 + * @return 结果对象 + */ + @AutoLog(value = "企标稽查流程-流程发起") + @ApiOperation(value="企标稽查流程-流程发起", notes="企标稽查流程-流程发起") + @PostMapping(value = "/flowStart") + public Result flowStart(@RequestBody EsInspectFlowVO esInspectFlowVO) { + esInspectFlowService.flowStart(esInspectFlowVO); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + + /** + * 企标稽查流程-流程保存 + * @param esInspectFlowVO 企标稽查流程VO对象 + * @return 结果对象 + */ + @AutoLog(value = "企标稽查流程-流程保存") + @ApiOperation(value="企标稽查流程-流程保存", notes="企标稽查流程-流程保存") + @PostMapping(value = "/flowSave") + public Result flowSave(@RequestBody EsInspectFlowVO esInspectFlowVO) { + esInspectFlowService.flowSave(esInspectFlowVO); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + + + /** + * 企标稽查流程-办理详情 + * @param projectId 项目id + * @return 结果对象 + */ + @AutoLog(value = "企标稽查流程-办理详情") + @ApiOperation(value="企标稽查流程-办理详情", notes="企标稽查流程-办理详情") + @GetMapping(value = "/queryDetailByProjectId") + @Translation + public Result queryDetailByProjectId(@ApiParam("项目id") String projectId, @ApiParam("任务id") String taskId) { + return Result.OK(esInspectFlowService.queryDetailByProjectId(projectId, taskId)); + } + + /** + * 企标稽查流程-流程审批 + * @param esInspectFlowVO 企标稽查流程VO对象 + * @return 结果对象 + */ + @AutoLog(value = "企标稽查流程-流程审批") + @ApiOperation(value="企标稽查流程-流程审批", notes="企标稽查流程-流程审批") + @PostMapping(value = "/flowApproval") + public Result flowApproval(@RequestBody EsInspectFlowVO esInspectFlowVO) { + esInspectFlowService.flowApproval(esInspectFlowVO); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + + /** + * 企标稽查流程-流程转办 + * @return 结果对象 + */ + @AutoLog(value = "企标稽查流程-流程转办") + @ApiOperation(value="企标稽查流程-流程转办", notes="企标稽查流程-流程转办") + @GetMapping(value = "/flowTransfer") + public Result flowTransfer(@ApiParam("任务id") String taskId, @ApiParam("用户id") String userId) { + esInspectFlowService.flowTransfer(taskId, userId); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java new file mode 100644 index 00000000..383d8658 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java @@ -0,0 +1,177 @@ +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.system.base.controller.JeroController; +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; +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.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + + + /** + * @Description: 企标稽查流程业务表 + * @Author: jero-boot + * @Date: 2023-11-22 + * @Version: V1.0 + */ +@Api(tags="企标稽查流程业务表") +@RestController +@RequestMapping("/esinspect/processEsInspect") +@Slf4j +public class ProcessEsInspectController extends JeroController { + private final IProcessEsInspectService processEsInspectService; + + public ProcessEsInspectController(IProcessEsInspectService processEsInspectService) { + this.processEsInspectService = processEsInspectService; + } + + /** + * 分页列表查询 + * + * @param processEsInspect + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "企标稽查流程业务表-分页列表查询") + @ApiOperation(value="企标稽查流程业务表-分页列表查询", notes="企标稽查流程业务表-分页列表查询") + @GetMapping(value = "/queryByPage") + public Result> queryByPage(ProcessEsInspectVO processEsInspectVO, + @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + return Result.OK(processEsInspectService.queryByPage(processEsInspectVO, pageNo, pageSize)); + } + + /** + * 列表查询 + * + * @param processEsInspectVO + * @return + */ + @AutoLog(value = "企标稽查流程业务表-列表查询") + @ApiOperation(value="企标稽查流程业务表-列表查询", notes="企标稽查流程业务表-列表查询") + @GetMapping(value = "/queryByList") + public Result> queryByList(ProcessEsInspectVO processEsInspectVO) { + return Result.OK(processEsInspectService.queryByList(processEsInspectVO)); + } + + /** + * 添加 + * + * @param processEsInspect + * @return + */ + @AutoLog(value = "企标稽查流程业务表-添加") + @ApiOperation(value="企标稽查流程业务表-添加", notes="企标稽查流程业务表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProcessEsInspect processEsInspect) { + processEsInspectService.add(processEsInspect); + return Result.OK("操作成功!"); + } + + /** + * 编辑 + * + * @param processEsInspect + * @return + */ + @AutoLog(value = "企标稽查流程业务表-编辑") + @ApiOperation(value="企标稽查流程业务表-编辑", notes="企标稽查流程业务表-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProcessEsInspect processEsInspect) { + processEsInspectService.editById(processEsInspect); + return Result.OK("操作成功!"); + } + + /** + * 通过id删除 + * + * @param map + * @return + */ + @AutoLog(value = "企标稽查流程业务表-通过id删除") + @ApiOperation(value="企标稽查流程业务表-通过id删除", notes="企标稽查流程业务表-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ + return Result.error("请选择数据!"); + } + processEsInspectService.deleteById(map.get("id")); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param map + * @return + */ + @AutoLog(value = "企标稽查流程业务表-批量删除") + @ApiOperation(value="企标稽查流程业务表-批量删除", notes="企标稽查流程业务表-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { + if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ + return Result.error("请选择数据!"); + } + this.processEsInspectService.deleteByIds(Arrays.asList(map.get("ids").split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "企标稽查流程业务表-通过id查询") + @ApiOperation(value="企标稽查流程业务表-通过id查询", notes="企标稽查流程业务表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProcessEsInspect processEsInspect = processEsInspectService.queryById(id); + if(processEsInspect==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(processEsInspect); + } + + /** + * 导出excel + * + * @param request + * @param processEsInspect + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProcessEsInspect processEsInspect) { + return super.exportXls(request, processEsInspect, ProcessEsInspect.class, "企标稽查流程业务表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProcessEsInspect.class); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java new file mode 100644 index 00000000..336c0309 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java @@ -0,0 +1,33 @@ +package com.jero.modules.activiti.process.esinspect.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.modules.laws.documenttool.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + + +/** + * @Description: 企标稽查流程业务表 + * @Author: jero-boot + * @Date: 2023-11-22 + * @Version: V1.0 + */ +@Data +@TableName("process_es_inspect") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="process_es_inspect对象", description="企标稽查流程业务表") +public class ProcessEsInspect extends BaseEntity { + /**项目id*/ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private java.lang.String projectId; + /**企标稽查id*/ + @Excel(name = "企标稽查id", width = 15) + @ApiModelProperty(value = "企标稽查id") + private java.lang.String inspect; +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/ProcessEsInspectMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/ProcessEsInspectMapper.java new file mode 100644 index 00000000..27d8fe71 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/ProcessEsInspectMapper.java @@ -0,0 +1,35 @@ +package com.jero.modules.activiti.process.esinspect.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; +import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 企标稽查流程业务表 + * @Author: jero-boot + * @Date: 2023-11-22 + * @Version: V1.0 + */ +public interface ProcessEsInspectMapper extends BaseMapper { + + /** + * 企标稽查流程业务表-分页查询 + * @param page + * @param queryWrapper + * @return + */ + IPage queryByPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + /** + * 企标稽查流程业务表-列表查询 + * @param queryWrapper + * @return + */ + List queryByList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml new file mode 100644 index 00000000..1ef22036 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + select pesi.id, + pesi.create_by, + pesi.create_time, + pesi.update_by, + pesi.update_time, + pesi.del_flag, + pesi.project_id, + pesi.inspect_id, + lesi.id, + lesi.create_by, + lesi.create_time, + lesi.update_by, + lesi.update_time, + inspect_no, + (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name, + standardization_work_group, + belong_dept, + plan_inspect_date, + inspect_user, + standardization_docking_user, + complete_date, + actual_inspect_user, + inspect_status, + group_concat(lesio.plan_inspect_object separator ',') plan_inspect_object + from process_es_inspect pesi + 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 + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IEsInspectFlowService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IEsInspectFlowService.java new file mode 100644 index 00000000..1fbc92fb --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IEsInspectFlowService.java @@ -0,0 +1,46 @@ +package com.jero.modules.activiti.process.esinspect.service; + +import com.jero.modules.activiti.process.esinspect.vo.EsInspectFlowVO; + +/** + * @InterfaceName: IEsInspectFlowService + * @Description: + * @Author: yjz + * @Date: 2023-11-23 09:23 + * @Version: 1.0 + **/ +public interface IEsInspectFlowService { + + /** + * 企标稽查流程-流程发起 + * @param esInspectFlowVO + */ + void flowStart(EsInspectFlowVO esInspectFlowVO); + + /** + * 企标稽查流程-流程保存 + * @param esInspectFlowVO + */ + void flowSave(EsInspectFlowVO esInspectFlowVO); + + /** + * 企标稽查流程-办理详情 + * @param projectId + * @param taskId + * @return + */ + EsInspectFlowVO queryDetailByProjectId(String projectId, String taskId); + + /** + * 企标稽查流程-流程审批 + * @param esInspectFlowVO + */ + void flowApproval(EsInspectFlowVO esInspectFlowVO); + + /** + * 企标稽查流程-流程转办 + * @param taskId + * @param userId + */ + void flowTransfer(String taskId, String userId); +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java new file mode 100644 index 00000000..a77c9ca5 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java @@ -0,0 +1,94 @@ +package com.jero.modules.activiti.process.esinspect.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; +import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Description: 企标稽查流程业务表 + * @Author: jero-boot + * @Date: 2023-11-22 + * @Version: V1.0 + */ +public interface IProcessEsInspectService extends IService { + + /** + * 分页查询 + * + * @param processEsInspect + * @param pageNo + * @param pageSize + * @param req + * @return + */ + IPage queryPage(ProcessEsInspect processEsInspect, Integer pageNo, Integer pageSize, HttpServletRequest req); + + /** + * 列表查询 + * + * @param processEsInspect + * @param req + * @return + */ + List queryList(ProcessEsInspect processEsInspect, HttpServletRequest req); + + /** + * 保存 + * + * @param processEsInspect + * @return + */ + void add(ProcessEsInspect processEsInspect); + + /** + * 更新 + * + * @param processEsInspect + * @return + */ + void editById(ProcessEsInspect processEsInspect); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProcessEsInspect queryById(String id); + + /** + * 企标稽查流程业务表-分页查询 + * @param processEsInspectVO + * @param pageNo + * @param pageSize + * @return + */ + IPage queryByPage(ProcessEsInspectVO processEsInspectVO, Integer pageNo, Integer pageSize); + + /** + * 企标稽查流程业务表-列表查询 + * @param processEsInspectVO + * @return + */ + List queryByList(ProcessEsInspectVO processEsInspectVO); +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java new file mode 100644 index 00000000..26608ee9 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java @@ -0,0 +1,38 @@ +package com.jero.modules.activiti.process.esinspect.service.impl; + +import com.jero.modules.activiti.process.esinspect.service.IEsInspectFlowService; +import com.jero.modules.activiti.process.esinspect.vo.EsInspectFlowVO; + +/** + * @ClassName: EsInspectFlowServiceImpl + * @Description: + * @Author: yjz + * @Date: 2023-11-23 09:25 + * @Version: 1.0 + **/ +public class EsInspectFlowServiceImpl implements IEsInspectFlowService { + @Override + public void flowStart(EsInspectFlowVO esInspectFlowVO) { + + } + + @Override + public void flowSave(EsInspectFlowVO esInspectFlowVO) { + + } + + @Override + public EsInspectFlowVO queryDetailByProjectId(String projectId, String taskId) { + return null; + } + + @Override + public void flowApproval(EsInspectFlowVO esInspectFlowVO) { + + } + + @Override + public void flowTransfer(String taskId, String userId) { + + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java new file mode 100644 index 00000000..6fa3b63e --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java @@ -0,0 +1,149 @@ +package com.jero.modules.activiti.process.esinspect.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.common.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; +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; +import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + + +/** + * @Description: 企标稽查流程业务表 + * @Author: jero-boot + * @Date: 2023-11-22 + * @Version: V1.0 + */ +@Service +@Transactional(rollbackFor = JeroBootException.class) +public class ProcessEsInspectServiceImpl extends ServiceImpl implements IProcessEsInspectService { + + private final ProcessEsInspectMapper processEsInspectMapper; + + public ProcessEsInspectServiceImpl(ProcessEsInspectMapper processEsInspectMapper) { + this.processEsInspectMapper = processEsInspectMapper; + } + + + /** + * 分页查询 + * + * @param processEsInspect + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @Override + public IPage queryPage(ProcessEsInspect processEsInspect, Integer pageNo, Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processEsInspect, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + return page(page, queryWrapper); + } + + /** + * 列表查询 + * + * @param processEsInspect + * @param req + * @return + */ + @Override + public List queryList(ProcessEsInspect processEsInspect, HttpServletRequest req) { + return list(QueryGenerator.initQueryWrapper(processEsInspect, req.getParameterMap())); + } + + /** + * 保存 + * + * @param processEsInspect + * @return + */ + @Override + public void add(ProcessEsInspect processEsInspect) { + Date now = new Date(); + processEsInspect.setCreateTime(now); + processEsInspect.setUpdateTime(now); + save(processEsInspect); + } + + /** + * 更新 + * + * @param processEsInspect + * @return + */ + @Override + public void editById(ProcessEsInspect processEsInspect) { + Date now = new Date(); + processEsInspect.setUpdateTime(now); + saveOrUpdate(processEsInspect); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProcessEsInspect queryById(String id) { + return getById(id); + } + + @Override + public IPage queryByPage(ProcessEsInspectVO processEsInspectVO, Integer pageNo, Integer pageSize) { + QueryWrapper queryWrapper = getProcessEsInspectVOQueryWrapper(processEsInspectVO); + return processEsInspectMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper); + } + + @Override + public List queryByList(ProcessEsInspectVO processEsInspectVO) { + QueryWrapper queryWrapper = getProcessEsInspectVOQueryWrapper(processEsInspectVO); + return processEsInspectMapper.queryByList(queryWrapper); + } + + @NotNull + private static QueryWrapper getProcessEsInspectVOQueryWrapper(ProcessEsInspectVO processEsInspectVO) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotBlank(processEsInspectVO.getProjectId()), "pesi.project_id", processEsInspectVO.getProjectId()); + queryWrapper.eq("pesi.del_flag", 0); + queryWrapper.orderByDesc("pesi.create_time"); + return queryWrapper; + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java new file mode 100644 index 00000000..1eab7b74 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java @@ -0,0 +1,33 @@ +package com.jero.modules.activiti.process.esinspect.vo; + +import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; +import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: 企标稽查流程VO + * @Description: + * @Author: yjz + * @Date: 2023-11-09 11:51 + * @Version: 1.0 + **/ +@Data +public class EsInspectFlowVO { + /**流程信息*/ + @ApiModelProperty(value = "流程信息") + private ProcessAll processAll; + /**流程审批信息*/ + @ApiModelProperty(value = "流程审批信息") + private ProcessApprovalRecord processApprovalRecord; + /**业务基本信息*/ + @ApiModelProperty(value = "业务基本信息") + private List processEsInspectList; + /**map*/ + @ApiModelProperty(value = "map") + private Map map; +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java new file mode 100644 index 00000000..92a4caa6 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java @@ -0,0 +1,25 @@ +package com.jero.modules.activiti.process.esinspect.vo; + +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +/** + * @ClassName: ProcessEsInspectVO + * @Description: + * @Author: yjz + * @Date: 2023-11-23 09:20 + * @Version: 1.0 + **/ +@Data +public class ProcessEsInspectVO extends EnterpriseStandardInspectVo { + /**项目id*/ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private java.lang.String projectId; + /**企标稽查id*/ + @Excel(name = "企标稽查id", width = 15) + @ApiModelProperty(value = "企标稽查id") + private java.lang.String inspect; +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java index 873bc4a8..62ba44c0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java @@ -42,4 +42,21 @@ public class EsInspectPlanCommon { * 企业稽查计划流程开始节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准 */ public static final String PROCESS_NODE_5 = "leader_approval"; + + /** + * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 + */ + public static final String INSPECT_STATUS_1 = "1"; + /** + * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 + */ + public static final String INSPECT_STATUS_2 = "2"; + /** + * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 + */ + public static final String INSPECT_STATUS_3 = "3"; + /** + * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 + */ + public static final String INSPECT_STATUS_4 = "4"; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java index 8cdd4636..5792d2a8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java @@ -43,11 +43,8 @@ public class ProcessEsInspectPlan extends BaseEntity { /**计划稽查对象*/ @Excel(name = "计划稽查对象", width = 15) @ApiModelProperty(value = "计划稽查对象") + @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") private String inspectObject; - /**计划稽查对象 翻译*/ - @ApiModelProperty(value = "计划稽查对象 翻译") - @TableField(exist = false) - private String inspectObjectDictText; /**主责标准化工作组*/ @Excel(name = "主责标准化工作组", width = 15) @ApiModelProperty(value = "主责标准化工作组") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java index 28ae60ae..f0100e11 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.jero.common.api.dto.message.SendMessageDTO; import com.jero.common.api.vo.SendMessageAPI; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.SnowflakeUtils; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.entity.ProcessNode; @@ -154,8 +155,8 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { public void flowSave(EsInspectPlanFlowVO esInspectPlanFlowVO) { // 流程信息 ProcessAll processAll = esInspectPlanFlowVO.getProcessAll(); - // 企标稽查计划业务表 - List processEsInspectPlanList = esInspectPlanFlowVO.getProcessEsInspectPlanList(); +// // 企标稽查计划业务表 +// List processEsInspectPlanList = esInspectPlanFlowVO.getProcessEsInspectPlanList(); // 流程审批信息 ProcessApprovalRecord processApprovalRecord = esInspectPlanFlowVO.getProcessApprovalRecord(); @@ -187,25 +188,25 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { processDraftService.save(processDraft); // 处理企标稽查计划业务表 - List newInspectPlanList = processEsInspectPlanList.stream().filter(v -> StringUtils.isBlank(v.getId())).collect(Collectors.toList()); - List oldInspectPlanList = processEsInspectPlanList.stream().filter(v -> StringUtils.isNotBlank(v.getId())).collect(Collectors.toList()); +// List newInspectPlanList = processEsInspectPlanList.stream().filter(v -> StringUtils.isBlank(v.getId())).collect(Collectors.toList()); +// List oldInspectPlanList = processEsInspectPlanList.stream().filter(v -> StringUtils.isNotBlank(v.getId())).collect(Collectors.toList()); // 设置项目id - newInspectPlanList.forEach(v -> v.setProjectId(processAll.getProjectId())); - // 保存新数据 - processEsInspectPlanService.saveBatch(newInspectPlanList); - - // 旧数据ids - List oldIds = oldInspectPlanList.stream().map(ProcessEsInspectPlan::getId).collect(Collectors.toList()); - - //删除旧数据 - if (oldIds.isEmpty()){ - processEsInspectPlanService.remove(new LambdaQueryWrapper() - .eq(ProcessEsInspectPlan::getProjectId, processAll.getProjectId())); - }else { - processEsInspectPlanService.remove(new LambdaQueryWrapper() - .eq(ProcessEsInspectPlan::getProjectId, processAll.getProjectId()) - .notIn(ProcessEsInspectPlan::getId, oldIds)); - } +// newInspectPlanList.forEach(v -> v.setProjectId(processAll.getProjectId())); +// // 保存新数据 +// processEsInspectPlanService.saveBatch(newInspectPlanList); +// +// // 旧数据ids +// List oldIds = oldInspectPlanList.stream().map(ProcessEsInspectPlan::getId).collect(Collectors.toList()); +// +// //删除旧数据 +// if (oldIds.isEmpty()){ +// processEsInspectPlanService.remove(new LambdaQueryWrapper() +// .eq(ProcessEsInspectPlan::getProjectId, processAll.getProjectId())); +// }else { +// processEsInspectPlanService.remove(new LambdaQueryWrapper() +// .eq(ProcessEsInspectPlan::getProjectId, processAll.getProjectId()) +// .notIn(ProcessEsInspectPlan::getId, oldIds)); +// } } private Map listToString(Map map) { @@ -233,7 +234,13 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { .eq(ProcessDraft::getProjectId, projectId) .eq(ProcessDraft::getUserId, loginUser.getId())); if (!processDraftList.isEmpty()){ - String id = processAll.getId(); + String id = ""; + if(Objects.isNull(processAll)){ + processAll = new ProcessAll(); + id = String.valueOf(SnowflakeUtils.snowflake()); + }else { + id = processAll.getId(); + } // 存在草稿 ProcessDraft processDraft = processDraftList.get(0); // 属性拷贝 @@ -280,8 +287,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { ListprocessNodeLinkList = processNodeLinkService.list( new LambdaQueryWrapper() .eq(ProcessNodeLink::getProcessDefinitionId, processDefinition.getId()) - .eq(ProcessNodeLink::getProcessNodeId, processNode.getId()) - .eq(ProcessNodeLink::getProcessInstanceId, processInstanceId)); + .eq(ProcessNodeLink::getProcessNodeId, processNode.getId())); if (!processNodeLinkList.isEmpty()){ List userIdList = processNodeLinkList.stream().map(ProcessNodeLink::getUserId).collect(Collectors.toList()); List sysUserList = sysUserService.listByIds(userIdList); @@ -334,7 +340,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { sendMessageDTO.setToUserId(v.getLinkUserIds()); Map sendMap = new HashMap<>(); ProcessAll process = processAllService.getByProcessInstanceId(processAll.getProcessInstanceId()); - sendMap.put("prcNum", process.getPrcNum()); + sendMap.put("prcNum", StringUtils.isNotBlank(process.getPrcNum()) ? process.getPrcNum() : ""); sendMap.put("prcName", process.getPrcName()); sendMessageDTO.setMap(sendMap); sendMessageAPI.sendMessage(sendMessageDTO); @@ -356,6 +362,8 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { EnterpriseStandardInspect enterpriseStandardInspect = new EnterpriseStandardInspect(); // 属性拷贝 BeanUtils.copyProperties(processEsInspectPlan, enterpriseStandardInspect); + // 稽查状态 + enterpriseStandardInspect.setInspectStatus(EsInspectPlanCommon.INSPECT_STATUS_1); // 计划稽查对象 String inspectObject = processEsInspectPlan.getInspectObject(); String[] inspectObjectList = inspectObject.split(","); @@ -363,6 +371,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { EnterpriseStandardInspectObject enterpriseStandardInspectObject = new EnterpriseStandardInspectObject(); enterpriseStandardInspectObject.setInspectId(processEsInspectPlan.getId()); enterpriseStandardInspectObject.setPlanInspectObject(object); + objectList.add(enterpriseStandardInspectObject); } list.add(enterpriseStandardInspect); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java index b2977597..0ae0a38a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java @@ -100,20 +100,23 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl list) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); for (ProcessEsInspectPlan processEsInspectPlan : list) { - List opinionList = iProcessEsInspectPlanOpinionService.list( - new LambdaQueryWrapper() - .eq(ProcessEsInspectPlanOpinion::getInspectPlanId, processEsInspectPlan.getId())); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(ProcessEsInspectPlanOpinion::getInspectPlanId, processEsInspectPlan.getId()); + if (StringUtils.isNotBlank(processEsInspectPlan.getNodeId()) && "Activity_0mnt8n8".equals(processEsInspectPlan.getNodeId())){ + queryWrapper.eq(ProcessEsInspectPlanOpinion::getCreateBy, loginUser.getUsername()); + } + List opinionList = iProcessEsInspectPlanOpinionService.list(queryWrapper); for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : opinionList) { - processEsInspectPlanOpinion.setCreateByDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlanOpinion.getCreateBy(), "")); - processEsInspectPlanOpinion.setUpdateByDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlanOpinion.getUpdateBy(), "")); + // 用户翻译 + processEsInspectPlanOpinion.setCreateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlanOpinion.getCreateBy())); + processEsInspectPlanOpinion.setUpdateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlanOpinion.getUpdateBy())); } processEsInspectPlan.setProcessEsInspectPlanOpinionList(opinionList); // 用户翻译 - processEsInspectPlan.setInspectObjectDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getInspectObject(), "")); processEsInspectPlan.setInspectUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getInspectUser(), "")); processEsInspectPlan.setStandardizationDockingUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getStandardizationDockingUser(), "")); - processEsInspectPlan.setStandardizationDockingUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getStandardizationDockingUser(), "")); processEsInspectPlan.setObjectOfConsultationDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getObjectOfConsultation(), "")); processEsInspectPlan.setCreateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlan.getCreateBy())); processEsInspectPlan.setUpdateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlan.getUpdateBy())); @@ -126,7 +129,9 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq(StringUtils.isNotBlank(processEsInspectPlan.getProjectId()), "project_id", processEsInspectPlan.getProjectId()); if (StringUtils.isNotBlank(processEsInspectPlan.getNodeId()) && "Activity_0mnt8n8".equals(processEsInspectPlan.getNodeId())){ - queryWrapper.like(StringUtils.isNotBlank(processEsInspectPlan.getNodeId()), "object_of_consultation", loginUser.getId()); + queryWrapper.and(qw -> + qw.eq("object_of_consultation", loginUser.getId()) + .or().eq("create_by", loginUser.getUsername())); } queryWrapper.orderByDesc("create_time"); return queryWrapper; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java index 78613b90..43f4b767 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java @@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.List; /** @@ -69,6 +70,33 @@ public class EnterpriseStandardInspectController extends JeroController> queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo, + @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + IPage pageList = esInspectService.queryByPage(enterpriseStandardInspectVo, pageNo, pageSize); + return Result.OK(pageList); + } + + /** + * 企标稽查-列表查询2 + * + * @return + */ + @AutoLog(value = "企标稽查-列表查询2") + @ApiOperation(value="企标稽查-列表查询2", notes="企标稽查-列表查询2") + @GetMapping(value = "/queryByList") + public Result> queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) { + return Result.OK(esInspectService.queryByList(enterpriseStandardInspectVo)); + } + /** * 延期稽查 * diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java index addeab00..0a04b422 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.enterprise.entity.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; @@ -43,6 +44,7 @@ public class EnterpriseStandardInspectVo { /** 所属部门 */ @Excel(name = "所属部门", width = 15, orderNum = "1") @ApiModelProperty(value = "所属部门") + @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") private String belongDept; /** 计划稽查日期 */ @@ -55,11 +57,13 @@ public class EnterpriseStandardInspectVo { /** 稽查负责人 */ @Excel(name = "稽查负责人", width = 15, orderNum = "1") @ApiModelProperty(value = "稽查负责人") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String inspectUser; /** 标准化组对接人 */ @Excel(name = "标准化组对接人", width = 15, orderNum = "1") @ApiModelProperty(value = "标准化组对接人") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String standardizationDockingUser; /** 实际稽查完成日期 */ @@ -72,6 +76,7 @@ public class EnterpriseStandardInspectVo { /** 实际稽查人 */ @Excel(name = "实际稽查人", width = 15, orderNum = "1") @ApiModelProperty(value = "实际稽查人") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String actualInspectUser; /** 稽查状态 */ @@ -91,4 +96,9 @@ public class EnterpriseStandardInspectVo { @ApiModelProperty(value = "延期稽查标识") private boolean delayFlag; + //================================= + /**ids 查询用*/ + @ApiModelProperty(value = "ids 查询用") + @TableField(exist = false) + private String ids; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java index dfa84290..3b9eeeb6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java @@ -1,6 +1,9 @@ package com.jero.modules.laws.enterprise.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; @@ -8,6 +11,8 @@ import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectDelay import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author ThinkBook * @description 针对表【laws_enterprise_standard_inspect(企业标准)】的数据库操作Mapper @@ -31,6 +36,21 @@ public interface EnterpriseStandardInspectMapper extends BaseMapper pageWithDelay(IPage page, @Param("param") ESQueryCommonDTO esQueryCommonDTO); + + /** + * 企标稽查-分页列表查询2 + * @param page + * @param queryWrapper + * @return + */ + IPage queryByPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + /** + * 企标稽查-列表查询2 + * @param queryWrapper + * @return + */ + List queryByList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml index a22b8d3e..3ad3e856 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml @@ -167,4 +167,38 @@ ORDER BY i.create_time DESC + + + + + + + select lesi.id, + lesi.create_by, + lesi.create_time, + lesi.update_by, + lesi.update_time, + inspect_no, + (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name, + standardization_work_group, + belong_dept, + plan_inspect_date, + inspect_user, + standardization_docking_user, + complete_date, + actual_inspect_user, + inspect_status, + group_concat(lesio.plan_inspect_object separator ',') plan_inspect_object + from laws_enterprise_standard_inspect lesi + 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 + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java index fdfe7cd3..3c2f8b04 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java @@ -8,6 +8,7 @@ import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.List; /** * @author ThinkBook @@ -53,4 +54,20 @@ public interface EnterpriseStandardInspectService extends IService queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo, Integer pageNo, Integer pageSize); + + /** + * 企标稽查-列表查询2 + * @param enterpriseStandardInspectVo + * @return + */ + List queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java index 6fc1df6b..e2bf5061 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java @@ -1,41 +1,34 @@ package com.jero.modules.laws.enterprise.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.common.exception.JeroBootException; -import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.DictModel; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectDelayVo; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectRectifyPlanMapper; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; 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 lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -176,6 +169,30 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo, Integer pageNo, Integer pageSize) { + QueryWrapper queryWrapper = getEnterpriseStandardInspectVoQueryWrapper(enterpriseStandardInspectVo); + return esInspectMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper); + } + + @Override + public List queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) { + QueryWrapper queryWrapper = getEnterpriseStandardInspectVoQueryWrapper(enterpriseStandardInspectVo); + return esInspectMapper.queryByList(queryWrapper); + } + + @NotNull + private static QueryWrapper getEnterpriseStandardInspectVoQueryWrapper(EnterpriseStandardInspectVo enterpriseStandardInspectVo) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getId()), "lesi.id", enterpriseStandardInspectVo.getId()); + if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getIds())){ + List list = Arrays.asList(enterpriseStandardInspectVo.getIds().split(",")); + queryWrapper.in("lesi.id", list); + } + queryWrapper.orderByDesc("lesi.createTime"); + return queryWrapper; + } }