Merge branch 'dev_20230829_change' into 'dev_20231013_ZC'

# Conflicts: # adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
2023-10-31 03:49:09 +00:00
parent 05d0018873 a8f10f075c
commit 865477f913
64 changed files with 5351 additions and 43 deletions
@@ -63,10 +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("29","PolicySolicitOpinionProcessWorkFlow");
+        map.put("33","PolicySolicitOpinionProcessWorkFlow");
        // 重点认证标准/政策合规性项目审查流程
-        map.put("30","PolicyComplianceProgramReviewProcessWorkFlow");
+        map.put("34","PolicyComplianceProgramReviewProcessWorkFlow");

        return map.get(type);
    }
@@ -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("入库成功");
+    }
+}
@@ -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("入库成功");
+    }
+}
@@ -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("入库成功");
+    }
+}
@@ -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);
+    }
+}
@@ -866,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;
@@ -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);
+    }
+}
@@ -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) {
+
+    }
+}