整合union

pom.xml

@@ -114,6 +114,7 @@
             <version>${fastjson.version}</version>
         </dependency>
 
+
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>

src/main/java/com/qs/serve/common/util/JsonUtil.java

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import lombok.experimental.UtilityClass;
 
 import java.util.ArrayList;
@@ -31,6 +32,7 @@ public class JsonUtil {
     static {
         MAPPER.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
         MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        //MAPPER.registerModule(new JavaTimeModule());
     }
 
     /**

src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsContractCostSubItem.java

@@ -17,9 +17,9 @@ public class TbsContractCostSubItem {
         private String activityCode;
         private String activityPurpose;
         private String costCode;
-        private LocalDate startDate;
-        private LocalDate endDate;
-        private LocalDate writeOffDate;
+        private String startDate;
+        private String endDate;
+        private String writeOffDate;
         private String productType;
         private String product;
         private String accountCode;
@@ -35,7 +35,7 @@ public class TbsContractCostSubItem {
         private String payItem;
         private String payCondition;
         private BigDecimal money;
-        private LocalDate payDate;
+        private String payDate;
         private String actualPayDate;
         private Integer payCompleteState;
         private String payRemark;
@@ -45,7 +45,7 @@ public class TbsContractCostSubItem {
     public static class ToDoItem{
         private String serviceDescription;
         private String deliveryStandard;
-        private LocalDate deliveryDate;
+        private String deliveryDate;
         private String agreeRemark;
 
     }

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java

@@ -6,6 +6,7 @@ import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.common.util.SpringUtils;
 import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.seeyon.entity.CtpAffair;
 import com.qs.serve.modules.seeyon.entity.SyAffairStateResult;
@@ -14,8 +15,10 @@ import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
 import com.qs.serve.modules.seeyon.enums.SyAffairState;
 import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
+import com.qs.serve.modules.sys.entity.SysPostUser;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
+import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
@@ -38,6 +41,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -77,6 +81,21 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
         return TbsSeeYonConst.CostApplyConf.Code();
     }
 
+
+    @Override
+    public String checkAffairSummery(String targetId) {
+        TbsCostApply tbsCostApply = costApplyService.getById(targetId);
+        String templateCode = getTemplateCode();
+        if(tbsCostApply.getContractFlag()!=null&&tbsCostApply.getContractFlag().equals(1)){
+            templateCode = TbsSeeYonConst.CostApplyContractConf.Code();
+        }
+        R<String> result = getRequestService().checkAffairSummery(templateCode,targetId);
+        if(result.getData()==null){
+            return "next";
+        }
+        return result.getData();
+    }
+
     @Override
     public R<String> addNode(CtpAddNodeParam param) {
         getRequestService().testConnection();
@@ -119,6 +138,44 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
         return requestService;
     }
 
+    @Override
+    public R<List<CtpAffairVo>> pageAffair(String targetId) {
+        boolean existFormId = checkSyFormIdIsNotNull(targetId);
+        if (!existFormId){
+            return R.ok(new ArrayList<>());
+        }
+        String templateCode = getTemplateCode();
+        TbsCostApply costApply = costApplyService.getById(targetId);
+        if(costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)){
+            templateCode = TbsSeeYonConst.CostApplyContractConf.Code();
+        }
+        R<List<CtpAffair>> syResult = getRequestService().commonListAffairs(targetId,null,templateCode);
+        List<CtpAffair> ctpAffairs = syResult.getData();
+        if(ctpAffairs.size()>0){
+            List<String> oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList());
+            List<SysUser> userList = getSysUserService().listByOaMemberIds(oaUserIds);
+            SysPostUserService postUserService = SpringUtils.getBean(SysPostUserService.class);
+            List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+            List<SysPostUser> postUserList = postUserService.listByUserIds(userIds);
+            Map<String,List<SysPostUser>> postMap = postUserList.stream().collect(Collectors.groupingBy(SysPostUser::getUserId));
+            List<CtpAffairVo> result = new ArrayList<>();
+            for (CtpAffair ctpAffair : ctpAffairs) {
+                CtpAffairVo ctpAffairVo = new CtpAffairVo();
+                ctpAffairVo.setAffairInfo(ctpAffair);
+                for (SysUser user : userList) {
+                    if(ctpAffair.getMemberId().equals(user.getSyUserId())){
+                        ctpAffairVo.setUserInfo(user.toSysUserVo());
+                        List<SysPostUser> postUsers = postMap.get(user.getId());
+                        ctpAffairVo.setUserPostList(postUsers);
+                    }
+                }
+                result.add(ctpAffairVo);
+            }
+            return R.ok(result);
+        }
+        return R.ok(new ArrayList<>());
+    }
+
     @Override
     public SysUserMapper getUserMapper() {
         return userMapper;

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -229,7 +229,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             data.put("supplierCode", tbsCostApply.getSupplierCode());
             data.put("targetId", tbsCostApply.getId()+"");
             data.put("targetCode", tbsCostApply.getCode());
-            data.put("exsp1",TbsSeeYonConst.CostApplyConf.Code());
+            data.put("exsp1",TbsSeeYonConst.CostApplyContractConf.Code());
             //添加跳转地址业务
             String urlKey = "exsp5"+IdUtil.simpleUUID();
             String baseJumpUrl = JumpToUtil.getUrl(projectProperties.getHostUrl(),TbsSeeYonConst.CostApplyConf.Code(),urlKey);
@@ -266,8 +266,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             data.put("bankAccount","");
             data.put("sealID","");
             data.put("sealName","");
-            data.put("sealNum","");
-            data.put("fileNum","");
+            data.put("sealNum","0");
+            data.put("fileNum","0");
 
             LambdaQueryWrapper<TbsCostContract> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsCostContract::getCostApplyId,tbsCostApply.getId());
@@ -276,8 +276,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 TbsCostContract contract = contracts.get(0);
                 data.put("contractName",contract.getContractName());
                 data.put("contractTotalMoney",contract.getContractAmount());
-                data.put("signDate",contract.getSignTime());
-                data.put("expireDate",contract.getExpireTime());
+                data.put("signDate",contract.getSignTime()==null?null:contract.getSignTime().toString());
+                data.put("expireDate",contract.getExpireTime()==null?null:contract.getExpireTime().toString());
                 data.put("contractContent",contract.getContractCondition());
                 data.put("contractFile","");
             }
@@ -301,9 +301,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 dataActivity.setActivityCode(currActivity.getActivityCode());
                 dataActivity.setActivityPurpose(currActivity.getActTitle());
                 dataActivity.setCostCode(tbsCostApply.getCode());
-                dataActivity.setStartDate(currActivity.getActStartDate());
-                dataActivity.setEndDate(currActivity.getActEndDate());
-                dataActivity.setWriteOffDate(currActivity.getPreCheckDate());
+                dataActivity.setStartDate(currActivity.getActStartDate()==null?null:currActivity.getActStartDate().toString());
+                dataActivity.setEndDate(currActivity.getActEndDate()==null?null:currActivity.getActEndDate().toString());
+                dataActivity.setWriteOffDate(currActivity.getPreCheckDate()==null?null:currActivity.getPreCheckDate().toString());
                 dataActivity.setProductType(centerGoods.getTargetType());
                 dataActivity.setProduct(centerGoods.getTargetName());
                 dataActivity.setAccountCode(centerGoods.getSubjectCode());
@@ -327,7 +327,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 subPayment.setPayItem(payCondition.getTitle());
                 subPayment.setPayCondition(payCondition.getConditionMsg());
                 subPayment.setMoney(currActivity.getTotalAmount());
-                subPayment.setPayDate(payCondition.getPaymentDate());
+                subPayment.setPayDate(payCondition.getPaymentDate()!=null?payCondition.getPaymentDate().toString():null);
                 subPayment.setActualPayDate(null);
                 subPayment.setPayCompleteState(payCondition.getPreNotifyStatus());
                 subPayment.setPayRemark(payCondition.getRemark());
@@ -342,7 +342,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 TbsContractCostSubItem.ToDoItem toDoItem = new TbsContractCostSubItem.ToDoItem();
                 toDoItem.setServiceDescription(costTodo.getDescr());
                 toDoItem.setDeliveryStandard(costTodo.getPayMsg());
-                toDoItem.setDeliveryDate(costTodo.getPrePayDate());
+                toDoItem.setDeliveryDate(costTodo.getPrePayDate()==null?null : costTodo.getPrePayDate().toString());
                 toDoItem.setAgreeRemark(costTodo.getRemark());
                 subList.add(toDoItem);
             }
@@ -354,7 +354,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             this.buildCommonApplyData(id, tbsCostApply, activityList, supplier, result, sysUser, data);
         }
         //修改申请编码
-        String templateCode = tbsCostApply.getCostThemeEditFlag().equals(1)
+        String templateCode = tbsCostApply.getContractFlag().equals(1)
                 ?TbsSeeYonConst.CostApplyContractConf.Code()
                 :TbsSeeYonConst.CostApplyConf.Code();
         BaseCreateProcessBo createProcess = new BaseCreateProcessBo();
@@ -369,7 +369,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         }
         String flowId = flowIdResult.getData();
         String formId = null;
-        R<String> formIdResult = seeYonService.getFormId(TbsSeeYonConst.CostApplyConf.Code(),tbsCostApply.getId());
+        R<String> formIdResult = seeYonService.getFormId(templateCode,tbsCostApply.getId());
         if(formIdResult.getStatus()==200){
             formId = formIdResult.getData();
         }
@@ -434,7 +434,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             budgetLogService.saveBatch(budgetLogList);
         }
         //创建流程后回调
-        BaseCreateCallbackBo callbackBo = new BaseCreateCallbackBo(TbsSeeYonConst.CostApplyConf.Code(),costApply.getId()+"");
+        BaseCreateCallbackBo callbackBo = new BaseCreateCallbackBo(templateCode,costApply.getId()+"");
         seeYonService.createCallbackStatus(callbackBo);
         activitySlottingFeeMapper.updatePassFlagByCostApplyId(costApply.getId(),2);