diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 5a1572d4..ff0bb4f8 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -4,6 +4,7 @@ import com.adc.da.common.*; import com.adc.da.common.Category; import com.adc.da.common.Page; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; +import com.adc.da.workFlow.entity.BusProcessModelHis; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,6 +19,9 @@ import java.util.Set; //@FeignClient(value = "shan6") public interface workFlowFeignClient { + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET) + BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); + @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisList",method = RequestMethod.GET) List evaluationHisList(@RequestParam("pid") String pid); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index da6071a8..d158c2f0 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -9,6 +9,7 @@ import com.adc.da.common.Page; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; +import com.adc.da.workFlow.entity.BusProcessModelHis; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; @@ -26,6 +27,11 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; + public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOne(pid,taskId); + return stringWrapper; + } + public List evaluationHisList(@RequestParam("pid") String pid){ List stringWrapper = workFlowFeignClient.evaluationHisList(pid); return stringWrapper; diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 1865962f..1e3215d2 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -17,10 +17,7 @@ import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.util.LoginUserUtil; import com.adc.da.workFlow.dao.ExportExcelMapper; -import com.adc.da.workFlow.entity.BusProcessEvaluationHis; -import com.adc.da.workFlow.entity.ExportExcel; -import com.adc.da.workFlow.entity.ExportExcelEO; -import com.adc.da.workFlow.entity.ProcessDetailExport; +import com.adc.da.workFlow.entity.*; import com.adc.da.workFlow.service.WorkFlowService; import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; @@ -50,6 +47,12 @@ public class WorkFlowController { // @Autowired // private ExportExcelMapper exportExcelMapper; + @ApiOperation(value = "查询在线编辑流程当前节点编辑对象") + @GetMapping("/processModelHisOne") + public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + return workFlowFeignClient.processModelHisOne(pid); + } + @ApiOperation(value = "查询流程父节点所有评分") @GetMapping("/evaluationHisList") public List evaluationHisList(@RequestParam("pid") String pid){ diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java new file mode 100644 index 00000000..82b0692a --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java @@ -0,0 +1,88 @@ +package com.adc.da.workFlow.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *

+ * 流程模块历史表 + *

+ * + * @author super_liu + * @since 2021-09-17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BusProcessModelHis对象", description="流程模块历史表") +public class BusProcessModelHis implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "ID", type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "标准id") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "处理人") + @TableField("USER_ID") + private String userId; + + @ApiModelProperty(value = "信息") + @TableField("MESG") + private String mesg; + + @ApiModelProperty(value = "节点信息") + @TableField("TASK_INFO") + private String taskInfo; + + @ApiModelProperty(value = "任务id") + @TableField("TASK_ID") + private String taskId; + + @ApiModelProperty(value = "流程实例id") + @TableField("P_ID") + private String pId; + + @ApiModelProperty(value = "流程名称") + @TableField("PRC_NAME") + private String prcName; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("UPDATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String updateTime; + + @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") + @TableField("EDIT_STATUS") + private String editStatus; + + @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") + @TableField("EDIT_FILE_PATH") + private String editFilePath; + + @ApiModelProperty(value = "逻辑状态") + @TableField("FLAG") + private String flag; + + @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") + @TableField(exist = false) + private String downLoadUrl; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index 04e3946f..0c88d87d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -23,6 +23,7 @@ import com.adc.da.slrs.wgWorkGroup.dao.WgWorkGroupDao; import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO; import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -333,15 +334,21 @@ public class WgWorkGroupServiceImpl extends ServiceImpl { WgDept wgDept=new WgDept(); BeanUtils.copyProperties(wgDeptShow,wgDept); + if (null==wgDept.getWgId()){ + wgDept.setWgId(wgWorkGroupShowDTO.getId()); + } wgDepts.add(wgDept); }); - flag = wgDeptService.saveOrUpdateBatch(wgDepts); } if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { List removeMeet = new ArrayList<>(); List wgMeetingUserRelations = new ArrayList<>(); wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { + if (null==wgMeetingInfo.getId()){ + wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); + wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); + } wgMeetingInfo.getMeetingPeople().forEach(s -> { WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); wgMeetingUserRelation.setUserId(s); @@ -350,27 +357,42 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { List wgNetInfos = new ArrayList<>(); wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { WgNetInfo wgNetInfo = new WgNetInfo(); BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); + if (null==wgNetInfo.getWgId()){ + wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); + } wgNetInfos.add(wgNetInfo); }); flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); } if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){ + wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { + if (null==wgPayInfo.getWgId()){ + wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); } if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()){ + wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { + if (null==wgStandorpolicyInfo.getWgId()){ + wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 864e0387..c2488f4b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -16,7 +16,7 @@ left join ts_user on sar_public_idea_all.user_id=ts_user.USID WHERE sar_public_idea_all.idea_id = #{ideaId} - LIMIT ${(page-1)*size},${page*size} + LIMIT ${(page-1)*size},${size} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml index 69179058..2f9f57ad 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml @@ -59,7 +59,7 @@ AND specific_item like concat(concat('%',#{specificItem}),'%') ORDER BY STAND_ID, specific_item - LIMIT ${(current-1)*size},${current*size} + LIMIT ${(current-1)*size},${size} ) c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows