FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test_20231106_for39' into 'fix_foton_20231031'

Browse Source 
# Conflicts:
#   adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
This commit is contained in:
高嵩
2023-11-06 02:39:17 +00:00
parent 166e94aa8a 014c29e52a
commit ee85b2f1cd
80 changed files with 6009 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+10
View File
@@ -509,4 +509,14 @@ public interface workFlowFeignClient {
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/fushen",method = RequestMethod.GET)
String fushen();
@RequestMapping(value = "/bat-wkflow/datas/policySolicitOpinion/queryPolicitOpinionEOList",method = RequestMethod.GET)
ResponseMessage<List<PolicySolicitOpinionEO>> queryPolicitOpinionEOList(@RequestParam Map<String, Object> params);
/**
* 查询重点认证标准/政策合规性项目审查任务明细
* @return
*/
@RequestMapping(value = "/bat-wkflow/queryZchgxxmscTaskDetail",method = RequestMethod.GET)
BusProcessNew queryZchgxxmscTaskDetail(@RequestParam Map<String, Object> params);
}
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+8
View File
@@ -479,4 +479,12 @@ public class workFlowFeignClientImpl {
public String fushen() {
return workFlowFeignClient.fushen();
}
public ResponseMessage<List<PolicySolicitOpinionEO>> queryPolicitOpinionEOList(@RequestParam Map<String, Object> params) {
return this.workFlowFeignClient.queryPolicitOpinionEOList(params);
}
public BusProcessNew queryZchgxxmscTaskDetail(@RequestParam Map<String, Object> params){
return workFlowFeignClient.queryZchgxxmscTaskDetail(params);
}
}
adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
+12
View File
@@ -63,6 +63,18 @@ public class ActDefineStartMap {
map.put("27","wdzxlc");
// 标准需求（翻译）申请流程
map.put("28","bzxqfy");
// 内外部会议入库流程
map.put("29","insideOutsideMeetingLibrary");
// 政策课题入会流程
map.put("30","policyResearchGroupEnrollment");
// 政策课题参会流程
map.put("31","policyResearchGroupAttendMeeting");
// 政策法规资料入库流程
map.put("32","PolicyLawsInformationLibrary");
// 政策征求意见流程
map.put("33","PolicySolicitOpinionProcessWorkFlow");
// 重点认证标准/政策合规性项目审查流程
map.put("34","PolicyComplianceProgramReviewProcessWorkFlow");
return map.get(type);
}
adc-da-activiti/src/main/java/com/adc/da/common/BusProcessName.java
+2
View File
@@ -58,4 +58,6 @@ public class BusProcessName implements Serializable {
private String taskBackAssignee;
private boolean showreceive;
private String taskDefinitionKey;
}
adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java
+4
View File
@@ -92,4 +92,8 @@ public class BusProcessNew {
@ApiModelProperty(value = "当前节点信息")
private String nowTaskInfo;
@TableField("RECEIVE_STATUS")
@ApiModelProperty("接收状态")
private String receiveStatus;
}
adc-da-activiti/src/main/java/com/adc/da/common/PolicySolicitOpinionEO.java
+108
View File
@@ -0,0 +1,108 @@
package com.adc.da.common;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.adc.da.att.entity.AttFileEO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
/**
* @Description: 政策征求意见列表
* @author: wangzhijiang
* @date: 2023-10-18
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="PolicySolicitOpinion对象", description="")
public class PolicySolicitOpinionEO {
private static final long serialVersionUID=1L;
@TableId(value = "ID", type = IdType.UUID)
private String id;
@TableField("PRC_ID")
private String prcId;
@TableField("SAR_LAWS_INFO_ID")
private String sarLawsInfoId;
// 章节编号
@Excel(name = "章节编号", orderNum = "1")
@TableField("CHAPTER_NUMBER")
private String chapterNumber;
// 章节条目
@Excel(name = "章节条目", orderNum = "2")
@TableField("CHAPTER_ENTRIES")
private String chapterEntries;
// 修改前
@Excel(name = "修改前", orderNum = "3")
@TableField("MODIFY_BEFORE")
private String modifyBefore;
// 修改后
@Excel(name = "修改后", orderNum = "4")
@TableField("MODIFY_AFTER")
private String modifyAfter;
// 修改理由
@Excel(name = "修改理由", orderNum = "5")
@TableField("MODIFY_REASON")
private String modifyReason;
// 原因
@Excel(name = "原因", orderNum = "6")
@TableField("CAUSE")
private String cause;
// 附件id
@TableField("ANNEX_FILE_ID")
private String annexFileId;
@Excel(name = "附件", orderNum = "7")
private String annexFileName;
private List<AttFileEO> annexFileList;
// 处理意见
@Excel(name = "处理意见", orderNum = "10")
@TableField("HANDLING_OPINIONS")
private String handlingOpinions;
// 处理原因
@Excel(name = "处理原因", orderNum = "11")
@TableField("HANDLING_CAUSE")
private String handlingCause;
// 提出人/创建人/责任人
@TableField("CREATE_USER_ID")
private String createUserId;
// 提出人/创建人/责任人
@Excel(name = "提出人", orderNum = "9")
private String createUserName;
// 提出部门/创建人所在部门
@Excel(name = "提出部门", orderNum = "8")
private String createUserDeptName;
// 创建时间
@TableField("CREATE_TIME")
private Date createTime;
// 更新人
@TableField("MODIFY_USER_ID")
private String modifyUserId;
// 更新时间
@TableField("MODIFY_TIME")
private Date modifyTime;
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemMeetingEOController.java
+39
View File
@@ -0,0 +1,39 @@
package com.adc.da.workFlow.controller;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.workFlow.service.ActSarItemMeetingEOService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @author tjzdw
* @description
* @date 2023/10/16
*/
@RestController
@RequestMapping("/${restPath}/lawss/meeting")
@Api(description = "|InsideOutsideMeeting|")
public class ActSarItemMeetingEOController {
@Resource
private ActSarItemMeetingEOService meetingEOService;
@ApiOperation(value = "|SarLawsStandInfo|内外部会议入库")
@PostMapping("/processCreateMeeting")
public ResponseMessage<String> processCreateMeeting(String infoJson) throws Exception {
if (StringUtils.isBlank(infoJson)) {
return Result.error("传入数据json不能为空");
}
meetingEOService.processCreateMeeting(infoJson);
return Result.success("入库成功");
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarLawsInformationEOController.java
+37
View File
@@ -0,0 +1,37 @@
package com.adc.da.workFlow.controller;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.workFlow.service.ActSarLawsInformationEOService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @author tjzdw
* @description
* @date 2023/10/27
*/
@Api("政策法规资料")
@RestController
@RequestMapping("/${restPath}/lawss/sarLawsTopic")
public class ActSarLawsInformationEOController {
@Resource
private ActSarLawsInformationEOService informationEOService;
@ApiOperation("政策法规资料入库")
@PostMapping("/processLawsRegulatoryInformation")
public ResponseMessage<String> processCreateLawsInformation(String infoJson) throws Exception {
if (StringUtils.isBlank(infoJson)) {
return Result.error("传入数据json不能为空");
}
informationEOService.processCreateLawsInformation(infoJson);
return Result.success("入库成功");
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarLawsTopicEOController.java
+48
View File
@@ -0,0 +1,48 @@
package com.adc.da.workFlow.controller;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.workFlow.service.ActSarLawsTopicEOService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @author tjzdw
* @description 政策课题流程
* @date 2023/10/25
*/
@Api("政策课题")
@RestController
@RequestMapping("/${restPath}/lawss/sarLawsTopic")
public class ActSarLawsTopicEOController {
@Resource
private ActSarLawsTopicEOService lawsTopicEOService;
@ApiOperation("政策课题入会")
@PostMapping("/processLawsTopicMembership")
public ResponseMessage<String> processLawsTopicMembership(String infoJson){
if (StringUtils.isBlank(infoJson)) {
return Result.error("传入数据json不能为空");
}
lawsTopicEOService.processLawsTopicMembership(infoJson);
return Result.success("入库成功");
}
@ApiOperation("政策课题参会")
@PostMapping("/processLawsTopicParticipation")
public ResponseMessage<String> processLawsTopicParticipation(String infoJson){
if (StringUtils.isBlank(infoJson)) {
return Result.error("传入数据json不能为空");
}
lawsTopicEOService.processLawsTopicParticipation(infoJson);
return Result.success("入库成功");
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+102
View File
@@ -41,6 +41,7 @@ import com.adc.da.sys.common.EmailUtils;
import com.adc.da.sys.dao.DicTypeEODao;
import com.adc.da.sys.entity.DicTypeEO;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.page.UserEOPage;
import com.adc.da.sys.service.IUserEOService;
import com.adc.da.util.LoginUserUtil;
import com.adc.da.workFlow.entity.*;
@@ -49,6 +50,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.poi.ss.usermodel.Workbook;
@@ -1523,4 +1525,104 @@ public class WorkFlowController extends BaseController {
public void conversionOnlineFilePDF(){
// return workFlowFeignClient.conversionOnlineFilePDF();
}
@ApiOperation(value = "查询政策征求意见列表")
@GetMapping("/queryPolicitOpinionEOList")
public ResponseMessage<List<PolicySolicitOpinionEO>> queryPolicitOpinionEOList(@RequestParam Map<String,Object> params) {
String currentUserId = LoginUserUtil.getUserId();
params.put("currentUserId", currentUserId);
ResponseMessage<List<PolicySolicitOpinionEO>> responseMessage = this.workFlowFeignClient.queryPolicitOpinionEOList(params);
List<PolicySolicitOpinionEO> datas = responseMessage.getData();
this.disposeData(datas);
return responseMessage;
}
public void disposeData(List<PolicySolicitOpinionEO> datas) {
if (CollectionUtils.isNotEmpty(datas)) {
List<String> userIdList = datas.stream().map(PolicySolicitOpinionEO::getCreateUserId).distinct().collect(Collectors.toList());
UserEOPage page = new UserEOPage();
page.setUsidList(userIdList);
List<UserEO> userEOS = this.userEOService.queryUserEoList(page);
String annexFileIds = Arrays.asList(
datas.stream().map(PolicySolicitOpinionEO::getAnnexFileId).collect(Collectors.joining(",")).split(",")
).stream().distinct().collect(Collectors.joining(","));
List<AttFileEO> fileInfoList = this.attFileEOService.getMultiFileInfos(annexFileIds);
for (PolicySolicitOpinionEO data : datas) {
List<UserEO> userEOList = userEOS.stream().filter(user -> {
return StringUtils.equals(data.getCreateUserId(), user.getUsid());
}).distinct().collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(userEOList)) {
data.setCreateUserName(userEOList.get(0).getUname());
data.setCreateUserDeptName(userEOList.get(0).getInstitutionName());
}
if (StringUtils.isNotEmpty(data.getAnnexFileId())) {
List<String> annexFileIdList = Arrays.asList(data.getAnnexFileId().split(","));
if (CollectionUtils.isNotEmpty(fileInfoList) && CollectionUtils.isNotEmpty(annexFileIdList)) {
List<AttFileEO> annexFileList = fileInfoList.stream().filter(fileInfo -> {
boolean flag = false;
for (String annexFileId : annexFileIdList) {
if (StringUtils.equals(fileInfo.getId(), annexFileId)) {
flag = true;
break;
}
}
return flag;
}).distinct().collect(Collectors.toList());
data.setAnnexFileList(annexFileList);
String annexFileNames = annexFileList.stream().map(AttFileEO::getOldFileName).distinct().collect(Collectors.joining(","));
data.setAnnexFileName(annexFileNames);
}
}
}
}
}
@ApiOperation(value = "导出政策征求意见列表")
@GetMapping("/exportPolicitOpinionEOListExcel")
public void exportExcel(HttpServletRequest request, HttpServletResponse response, String exportName, @RequestParam Map<String,Object> params) throws Exception {
OutputStream os = null;
Workbook workbook = null;
ResponseMessage<List<PolicySolicitOpinionEO>> responseMessage = this.workFlowFeignClient.queryPolicitOpinionEOList(params);
List<PolicySolicitOpinionEO> exportDataList = responseMessage.getData();
this.disposeData(exportDataList);
try {
if (StringUtils.isEmpty(exportName)) {
exportName = "征求意见列表";
}
response.setHeader("Content-Disposition",
"attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx",request));
response.setContentType("application/force-download");
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF);
workbook = ExcelExportUtil.exportExcel(exportParams, PolicySolicitOpinionEO.class, exportDataList);
workbook.setSheetName(0,"Sheet1");
os = response.getOutputStream();
workbook.write(os);
os.flush();
} catch (Exception e) {
e.printStackTrace();
throw new AdcDaBaseException("导出" + exportName + "列表数据失败，请重试");
} finally {
IOUtils.closeQuietly(os);
}
}
@ApiOperation(value = "查询重点认证标准/政策合规性项目审查任务明细")
@GetMapping("/queryZchgxxmscTaskDetail")
public BusProcessNew queryZchgxxmscTaskDetail(@RequestParam Map<String, Object> params) {
/**
* params:
* taskIds
* prcId
* taskDefinitionKey
*/
String currentUserId = LoginUserUtil.getUserId();
params.put("currentUserId", currentUserId);
return workFlowFeignClient.queryZchgxxmscTaskDetail(params);
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemMeetingEOService.java
+38
View File
@@ -0,0 +1,38 @@
package com.adc.da.workFlow.service;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutsideMeeting;
import com.adc.da.slrs.InsideOntSideMeeting.service.InsideOutsideMeetingService;
import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
/**
* @author tjzdw
* @description
* @date 2023/10/16
*/
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class ActSarItemMeetingEOService {
@Resource
private InsideOutsideMeetingService meetingService;
private static final Logger logger = LoggerFactory.getLogger(ActSarItemMeetingEOService.class);
public void processCreateMeeting(String meetingInfo) {
InsideOutsideMeeting insideOutsideMeeting = JSONObject.parseObject(meetingInfo, InsideOutsideMeeting.class);
if (insideOutsideMeeting == null) {
throw new AdcDaBaseException("入库失败，会议信息出错");
}
logger.info("内外部会议入库：" + insideOutsideMeeting);
meetingService.addMeetingInfo(insideOutsideMeeting);
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java
+50 -45
View File
@@ -89,7 +89,7 @@ public class ActSarItemsLawsEOService {
private boolean elasflag;
/***
* @Description: 国内外标准流程入库"
* @Description: 政策流程入库"
* @Author: yangxuenan
* @Date: 2020/12/7 13:48
* @Param: [standJson]
@@ -100,8 +100,8 @@ public class ActSarItemsLawsEOService {
standMap = JSONObject.parseObject(standJson);
if (standMap != null && !standMap.isEmpty()) {
String prcNum = String.valueOf(standMap.get("prcNum"));
String prcName = String.valueOf(standMap.get("prcName"));
String standType = String.valueOf(standMap.get("standType"));
String lawsName = String.valueOf(standMap.get("lawsName"));
// String standType = String.valueOf(standMap.get("standType"));
// String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估
SarLawsStandInfo sarLawsStandInfo = new SarLawsStandInfo();
// if(standMap.containsKey("standId")) {
@@ -140,11 +140,11 @@ public class ActSarItemsLawsEOService {
String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarLawsStandInfo.setSarStandAttrEOStr(resData);
// 根据标准号判断数据是否已存在
String lawsNumber = "";
if(StringUtils.isNotBlank(sarLawsStandInfo.getLawsNumber()) && !"null".equals(sarLawsStandInfo.getLawsNumber())){
lawsNumber = sarLawsStandInfo.getLawsNumber();
}
List<SarLawsStandInfo> lawsList = sarLawsStandInfoService.selectStandardsByStandNumber(lawsNumber);
// String lawsNumber = "";
// if(StringUtils.isNotBlank(sarLawsStandInfo.getLawsNumber()) && !"null".equals(sarLawsStandInfo.getLawsNumber())){
// lawsNumber = sarLawsStandInfo.getLawsNumber();
// }
// List<SarLawsStandInfo> lawsList = sarLawsStandInfoService.selectStandardsByStandNumber(lawsNumber);
//此处判断是否是带入的标准
if(StringUtils.isNotBlank(sarLawsStandInfo.getId())) {
SarLawsStandInfo query = new SarLawsStandInfo();
@@ -161,9 +161,7 @@ public class ActSarItemsLawsEOService {
if (StringUtils.isNotBlank(relatePro)) {
String[] processSplit = relatePro.split(",");
Set<String> processSet = new HashSet<>();
for(String sData:processSplit){
processSet.add(sData);
}
Collections.addAll(processSet, processSplit);
processSet.add(prcNum);
relatePro = StringUtils.join(processSet.toArray(), ",");
} else {
@@ -173,40 +171,42 @@ public class ActSarItemsLawsEOService {
sarLawsStandInfoService.updateSarLawsStandInfo(sarLawsStandInfo);
// 编辑相关流程
iSarLawsAttrInfoService.updateLawsInfo(sarLawsStandInfo.getId(),"XGLC",relatePro);
String content = "新增一条相关流程:" +prcName+" "+prcNum;
sarUpdLogEOService.createBaseLog(sarLawsStandInfo.getId(),standType+"_STAND",content);
}else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况
String standId = lawsList.get(0).getId();
SarLawsStandInfo query = new SarLawsStandInfo();
query.setId(standId);
sarLawsStandInfoService.attrInfoDetails(query);
Map<String, Object> attrInfoMap = query.getAttrInfoMap();
if(attInfoMap!=null && !attInfoMap.isEmpty()){
updateStandFileFieldData(attInfoMap,attrInfoMap);
resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarLawsStandInfo.setSarStandAttrEOStr(resData);
}
// 查询原相关流程
String relatePro = iSarLawsAttrInfoService.selectFieldValByLawsId("XGLC",standId);
if (StringUtils.isNotBlank(relatePro)) {
String[] processSplit = relatePro.split(",");
Set<String> processSet = new HashSet<>();
for(String sData:processSplit){
processSet.add(sData);
}
processSet.add(prcNum);
relatePro = StringUtils.join(processSet.toArray(), ",");
} else {
relatePro = prcNum;
}
// 编辑标准
sarLawsStandInfo.setId(standId);
sarLawsStandInfoService.updateSarLawsStandInfo(sarLawsStandInfo);
// 编辑相关流程
iSarLawsAttrInfoService.updateLawsInfo(standId,"XGLC",relatePro);
String content = "新增一条相关流程:" +prcName+" "+prcNum;
sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content);
} else {//标准号、ID都不存在的情况
String content = "新增一条相关流程:" +lawsName+" "+prcNum;
sarUpdLogEOService.createBaseLog(sarLawsStandInfo.getId(),lawsName+"_LAWS",content);
}
// else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况
// String standId = lawsList.get(0).getId();
// SarLawsStandInfo query = new SarLawsStandInfo();
// query.setId(standId);
// sarLawsStandInfoService.attrInfoDetails(query);
// Map<String, Object> attrInfoMap = query.getAttrInfoMap();
// if(attInfoMap!=null && !attInfoMap.isEmpty()){
// updateStandFileFieldData(attInfoMap,attrInfoMap);
// resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
// sarLawsStandInfo.setSarStandAttrEOStr(resData);
// }
// // 查询原相关流程
// String relatePro = iSarLawsAttrInfoService.selectFieldValByLawsId("XGLC",standId);
// if (StringUtils.isNotBlank(relatePro)) {
// String[] processSplit = relatePro.split(",");
// Set<String> processSet = new HashSet<>();
// for(String sData:processSplit){
// processSet.add(sData);
// }
// processSet.add(prcNum);
// relatePro = StringUtils.join(processSet.toArray(), ",");
// } else {
// relatePro = prcNum;
// }
// // 编辑标准
// sarLawsStandInfo.setId(standId);
// sarLawsStandInfoService.updateSarLawsStandInfo(sarLawsStandInfo);
// // 编辑相关流程
// iSarLawsAttrInfoService.updateLawsInfo(standId,"XGLC",relatePro);
// String content = "新增一条相关流程:" +prcName+" "+prcNum;
// sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content);
// }
else {//标准号、ID都不存在的情况
// 新增方法
sarLawsStandInfoService.createSarStandardsInfo(sarLawsStandInfo);
// 编辑相关流程
@@ -836,6 +836,10 @@ public class ActSarItemsLawsEOService {
case "country": sarLawsStandInfo.setCountry(valueStr); break;
case "id": sarLawsStandInfo.setId(valueStr); break;
case "lawsType": sarLawsStandInfo.setLawsType(valueStr); break;
case "lawsTypeFirstLevel": sarLawsStandInfo.setLawsTypeFirstLevel(valueStr); break;
case "lawsTypeSecondLevel": sarLawsStandInfo.setLawsTypeSecondLevel(valueStr); break;
case "lawsTypeThirdLevel": sarLawsStandInfo.setLawsTypeThirdLevel(valueStr); break;
case "lawsTypeFourthLevel": sarLawsStandInfo.setLawsTypeFourthLevel(valueStr); break;
case "lawsNumber": sarLawsStandInfo.setLawsNumber(valueStr); break;
case "lawsName": sarLawsStandInfo.setLawsName(valueStr); break;
case "lawsEnName": sarLawsStandInfo.setLawsEnName(valueStr); break;
@@ -862,6 +866,7 @@ public class ActSarItemsLawsEOService {
case "isRelateAccess": sarLawsStandInfo.setIsRelateAccess(valueStr); break;
case "lawsYear": sarLawsStandInfo.setLawsYear(valueStr); break;
case "lawsNotisyncNum": sarLawsStandInfo.setLawsNotisyncNum(valueStr); break;
case "notisyncNumLink": sarLawsStandInfo.setNotisyncNumLink(valueStr); break;
case "lawsBulletin": sarLawsStandInfo.setLawsBulletin(valueStr); break;
case "lawsLabel": sarLawsStandInfo.setLawsLabel(valueStr); break;
case "lawsRemark": sarLawsStandInfo.setLawsRemark(valueStr); break;
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarLawsInformationEOService.java
+48
View File
@@ -0,0 +1,48 @@
package com.adc.da.workFlow.service;
import com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformation;
import com.adc.da.slrs.sarLawsInformation.service.SarLawsInformationService;
import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
/**
* @author tjzdw
* @description
* @date 2023/10/27
*/
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class ActSarLawsInformationEOService {
@Resource
private SarLawsInformationService informationService;
private static final Logger logger = LoggerFactory.getLogger(ActSarLawsInformationEOService.class);
public void processCreateLawsInformation(String lawsInformationInfo) {
SarLawsInformation sarLawsInformation = JSONObject.parseObject(lawsInformationInfo, SarLawsInformation.class);
JSONObject jsonObject = JSONObject.parseObject(lawsInformationInfo);
String applyUserId = jsonObject.getString("applyUserId");
String applyUserName = jsonObject.getString("applyUserName");
String approverId = jsonObject.getString("approverId");
String approverName = jsonObject.getString("approverName");
String createAndApproveBy = "";
// 判断发起人和审批人是否相同
if (approverId.equals(applyUserId)) {
createAndApproveBy = applyUserName + "(" + applyUserId + ")";
}else {
createAndApproveBy = applyUserName + "(" + applyUserId + ")," + approverName + "(" + approverId + ")";
}
sarLawsInformation.setCreateAndApproveBy(createAndApproveBy);
sarLawsInformation.setDownloadableBy(createAndApproveBy);
sarLawsInformation.setViewableBy(createAndApproveBy);
logger.info("政策法规资料入库：" + sarLawsInformation);
informationService.addLawsInformation(sarLawsInformation);
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarLawsTopicEOService.java
+41
View File
@@ -0,0 +1,41 @@
package com.adc.da.workFlow.service;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopic;
import com.adc.da.slrs.sarLawsTopic.service.SarLawsTopicService;
import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
/**
* @author tjzdw
* @description
* @date 2023/10/25
*/
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class ActSarLawsTopicEOService {
@Resource
private SarLawsTopicService lawsTopicService;
private static final Logger logger = LoggerFactory.getLogger(ActSarLawsTopicEOService.class);
public void processLawsTopicMembership(String lawsTopicInfo) {
SarLawsTopic sarLawsTopic = JSONObject.parseObject(lawsTopicInfo, SarLawsTopic.class);
if (sarLawsTopic == null) {
throw new AdcDaBaseException("入库失败，政策课题信息出错");
}
logger.info("政策课题入会：" + sarLawsTopic);
lawsTopicService.addLawsTopicInfo(sarLawsTopic);
}
public void processLawsTopicParticipation(String infoJson) {
}
}