Merge branch 'develop_master' into FOTON
This commit is contained in:
super_liu
@@ -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<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid);
|
||||
|
||||
|
||||
@@ -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<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){
|
||||
List<BusProcessEvaluationHis> stringWrapper = workFlowFeignClient.evaluationHisList(pid);
|
||||
return stringWrapper;
|
||||
|
||||
+7
-4
@@ -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<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){
|
||||
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 流程模块历史表
|
||||
* </p>
|
||||
*
|
||||
* @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;
|
||||
}
|
||||
+26
-4
@@ -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<WgWorkGroupDao, WgWorkGr
|
||||
wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> {
|
||||
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<String> removeMeet = new ArrayList<>();
|
||||
List<WgMeetingUserRelation> 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<WgWorkGroupDao, WgWorkGr
|
||||
});
|
||||
removeMeet.add(wgMeetingInfo.getId());
|
||||
});
|
||||
flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos());
|
||||
if (!removeMeet.isEmpty()) {
|
||||
wgMeetingUserRelationService.removeByIds(removeMeet);
|
||||
wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations);
|
||||
}
|
||||
|
||||
|
||||
flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos());
|
||||
}
|
||||
if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) {
|
||||
List<WgNetInfo> 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());
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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}
|
||||
</select>
|
||||
|
||||
<select id="getAllDataByIdeaCount" resultType="java.lang.Integer">
|
||||
|
||||
+2
-2
@@ -168,7 +168,7 @@
|
||||
</if>
|
||||
</if>
|
||||
|
||||
limit ${(page-1)*size},${page*size}
|
||||
limit ${(page-1)*size},${size}
|
||||
</select>
|
||||
|
||||
<select id="selectPagessolostar" resultType="java.lang.String">
|
||||
@@ -256,7 +256,7 @@
|
||||
</if>
|
||||
</if>
|
||||
)
|
||||
limit ${(page-1)*size},${page*size}
|
||||
limit ${(page-1)*size},${size}
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
+1
-1
@@ -59,7 +59,7 @@
|
||||
AND specific_item like concat(concat('%',#{specificItem}),'%')
|
||||
</if>
|
||||
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
|
||||
</select>
|
||||
<select id="getAllDatasCout" resultType="java.lang.Integer">
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@
|
||||
</if>
|
||||
ORDER BY
|
||||
PRODUCT_NAME ASC
|
||||
limit ${(page-1)*pageSize},${page*pageSize}
|
||||
limit ${(page-1)*pageSize},${pageSize}
|
||||
</select>
|
||||
|
||||
<select id="selectPagesCount"
|
||||
|
||||
+1
-1
@@ -759,7 +759,7 @@
|
||||
SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
|
||||
or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ',''))
|
||||
<if test="mark == 996">
|
||||
or (stand_name like concat(concat('%',#{page.standNumber}),'%'))
|
||||
or (trim(replace(stand_name,' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) )
|
||||
</if>
|
||||
)
|
||||
<!-- and SAR_STANDARDS_INFO.STAND_YEAR = ''-->
|
||||
|
||||
@@ -799,10 +799,11 @@
|
||||
from ts_user
|
||||
where 1=1
|
||||
<if test="name != null and name != '' ">
|
||||
ts_user.UNAME like concat(concat('%',#{name}),'%') or
|
||||
and ts_user.UNAME like concat(concat('%',#{name}),'%') or
|
||||
ts_user.USID like concat(concat('%',#{name}),'%')
|
||||
</if>
|
||||
limit ${(page-1)*20},${page*20}
|
||||
ORDER BY ts_user.USID
|
||||
limit ${(page-1)*20},${20}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user