Merge remote-tracking branch 'origin/muti_db' into muti_db

src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java

@@ -37,4 +37,6 @@ public class CtpAffair {
     /** 评论时间 */
     private Date commentTime;
 
+    private String targetId;
+
 }

src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java

@@ -427,7 +427,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{
      * @return
      */
     default Object compensateFinished(String targetId){
-        return null;
+        return this.doFinished(new TbsAffairCommitBo(targetId));
     }
 
     /**

src/main/java/com/qs/serve/modules/seeyon/service/SeeYonRequestService.java

@@ -24,6 +24,8 @@ public interface SeeYonRequestService {
 
     R<List<CtpAffair>> commonListAffairsV2(String targetId,String targetCode,String syFormId,String templateCode);
 
+    R<List<CtpAffair>> commonListAffairsV3(String targetId,String targetCode,String syFormId,String templateCode);
+
     R<String> commonCommit(TbsAffairCommitBo affairCommit,String formCode,String formRecordId);
 
     boolean testConnection();

src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java

@@ -68,6 +68,21 @@ public class SeeYonRequestServiceImpl implements SeeYonRequestService {
         return this.listFormAffair(param);
     }
 
+    @Override
+    public R<List<CtpAffair>> commonListAffairsV3(String targetId, String targetCode, String syFormId, String templateCode) {
+        SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
+        if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){
+            return R.error("当前账号未绑定致远用户信息");
+        }
+        CtpAffairQo param = new CtpAffairQo();
+        param.setTargetId(targetId);
+        param.setFormMainId(syFormId);
+        param.setTargetCode(targetCode);
+        param.setVer("v3");
+        param.setTemplateCode(templateCode);
+        return this.listFormAffair(param);
+    }
+
     @Override
     public R<String> commonCommit(TbsAffairCommitBo affairCommit,String formCode,String formRecordId) {
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());

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

@@ -542,6 +542,10 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
         List<String> existKeyList = new ArrayList<>();
 
         for (TbsActivitySubjectBo subjectBo : activityBo.getActivitySubjectList()) {
+            boolean existChilds = subjectService.count(new LambdaQueryWrapper<BmsSubject>().eq(BmsSubject::getPid,subjectBo.getSubjectId()))>0;
+            if(existChilds){
+                Assert.throwEx("部分科目不符合规范,请选择最后一级科目");
+            }
             BmsSubject subject = subjectService.getById(subjectBo.getSubjectId());
             if(subject==null){
                 Assert.throwEx("部分科目不存在了，请重新编辑");

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

@@ -202,7 +202,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
         if(costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)){
             templateCode = TbsSeeYonConst.CostApplyContractConf.Code();
         }
-        R<List<CtpAffair>> syResult = getRequestService().commonListAffairsV2(targetId,costApply.getCode(),null,templateCode);
+        R<List<CtpAffair>> syResult = getRequestService().commonListAffairsV3(targetId,costApply.getCode(),null,templateCode);
         List<CtpAffair> ctpAffairs = syResult.getData();
         if(ctpAffairs.size()>0){
             DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class);
@@ -221,6 +221,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
                 ctpAffairVo.setAffairInfo(ctpAffair);
                 //2已发
                 if(ctpAffair!=null&&ctpAffair.getState().equals(2)){
+                    //无法兼容退回情况，
 //                    String costId = ctpAffair.getCostApplyId();
 //                    if(costId!=null){
 //                        TbsCostApply costApply1 = costApplyService.getById(costId);

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

@@ -3,6 +3,7 @@ package com.qs.serve.modules.tbs.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.serve.common.config.properties.ProjectProperties;
+import com.qs.serve.common.framework.redis.RedisService;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.util.*;
@@ -23,6 +24,7 @@ import com.qs.serve.modules.goods.entity.GoodsSpu;
 import com.qs.serve.modules.goods.service.GoodsCategoryService;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
+import com.qs.serve.modules.oms.entity.OmsOrder;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.entity.SysUser;
@@ -107,6 +109,7 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
     private final TbsBudgetConditionService tbsBudgetConditionService;
     private final TbsScheduleItemBudgetMapper tbsScheduleItemBudgetMapper;
     private SysAttachService attachService;
+    private RedisService redisService;
 
     @Override
     public TbsCostApply copyById(Long costId) {
@@ -151,6 +154,7 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public TbsCostApply toSetChanged(Long costId) {
+        redisService.throwResLock(TbsCostApply.class.getSimpleName(),costId+"");
         String userId = AuthContextUtils.getSysUserId();
         TbsCostApply orgCost = tbsCostApplyService.getById(costId);
         if(orgCost.getCancelFlag().equals(1)){

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

@@ -2,8 +2,10 @@ package com.qs.serve.modules.tbs.service.impl;
 
 import java.util.List;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.gson.JsonObject;
 import com.qs.serve.common.config.properties.ProjectProperties;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.*;
@@ -90,6 +92,14 @@ public class TbsCostTodoOperationServiceImpl implements SeeYonOperationService {
         if(flowIdResult.getStatus()!=200){
             Assert.throwEx("远程服务调用失败");
         }
+        String jsonBody = flowIdResult.getData();
+        if(StringUtils.hasText(jsonBody)&&jsonBody.contains("code")){
+            JSONObject jsonObject = JSONObject.parseObject(jsonBody);
+            Integer rs = jsonObject.getInteger("code");
+            if (rs==null || !rs.equals(0)){
+                Assert.throwEx("发起流程失败 "+jsonObject.getString("message"));
+            }
+        }
         String formId = null;
         R<String> formIdResult = seeYonService.getFormId(templateCode,todoId);
         if(formIdResult.getStatus()==200){

src/main/resources/mapper/his/HisUserSupplierMapper.xml

@@ -87,6 +87,12 @@
             or `his_user_supplier`.`supplier_name` like concat('%',#{query.queryValue},'%')
          )
         </if>
+        <if test="query.supplierCode != null and query.supplierCode != ''">
+            and `his_user_supplier`.`supplier_code` like concat('%',#{query.supplierCode},'%')
+        </if>
+        <if test="query.supplierName != null and query.supplierName != ''">
+            and `his_user_supplier`.`supplier_name` like concat('%',#{query.supplierName},'%')
+        </if>
         <if test="query.selectUserIds!=null and query.selectUserIds.size > 0">
             and `his_user_supplier`.`user_id` in
             <foreach collection="query.selectUserIds" item="selectId" index="i" open="(" close=")" separator=",">