加签支持附件；人员组微调

src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java

@@ -1,34 +1,25 @@
 package com.qs.serve.modules.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.modules.biz.consts.GroupDataType;
 import com.qs.serve.modules.biz.entity.BizUserGroupItem;
 import com.qs.serve.modules.biz.entity.bo.BizUserGroupBatchBo;
 import com.qs.serve.modules.biz.service.BizUserGroupItemService;
 import com.qs.serve.modules.biz.service.impl.BizUserGroupApplicationService;
-import com.qs.serve.modules.sys.entity.SysDept;
 import com.qs.serve.modules.sys.entity.SysUser;
-import com.qs.serve.modules.sys.service.SysDeptService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.biz.entity.BizUserGroup;
 import com.qs.serve.modules.biz.service.BizUserGroupService;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/qs/serve/modules/biz/entity/BizUserGroup.java

@@ -89,23 +89,5 @@ public class BizUserGroup implements Serializable {
     @TableField(exist = false)
     List<?> groupItemList;
 
-	public static BizUserGroup toNewObject(BizUserGroup source){
-		BizUserGroup userGroup = new BizUserGroup();
-		userGroup.setId(source.getId());
-		userGroup.setGroupName(source.getGroupName());
-		userGroup.setUserId(source.getUserId());
-		userGroup.setUserCode(source.getUserCode());
-		userGroup.setUserName(source.getUserName());
-		userGroup.setScene(source.getScene());
-		userGroup.setRemark(source.getRemark());
-		userGroup.setCreateTime(source.getCreateTime());
-		userGroup.setCreateBy(source.getCreateBy());
-		userGroup.setUpdateTime(source.getUpdateTime());
-		userGroup.setUpdateBy(source.getUpdateBy());
-		userGroup.setDelFlag(source.getDelFlag());
-		userGroup.setTenantId(source.getTenantId());
-		return userGroup;
-	}
-
 }
 

src/main/java/com/qs/serve/modules/biz/entity/BizUserGroupItem.java

@@ -84,24 +84,5 @@ public class BizUserGroupItem implements Serializable {
     @JsonProperty
     private String tenantId;
 
-
-	public static BizUserGroupItem toNewObject(BizUserGroupItem source){
-		BizUserGroupItem userGroupItem = new BizUserGroupItem();
-		userGroupItem.setId(source.getId());
-		userGroupItem.setGroupId(source.getGroupId());
-		userGroupItem.setTargetType(source.getTargetType());
-		userGroupItem.setTargetId(source.getTargetId());
-		userGroupItem.setTargetName(source.getTargetName());
-		userGroupItem.setTargetCode(source.getTargetCode());
-		userGroupItem.setRemark(source.getRemark());
-		userGroupItem.setCreateTime(source.getCreateTime());
-		userGroupItem.setCreateBy(source.getCreateBy());
-		userGroupItem.setUpdateTime(source.getUpdateTime());
-		userGroupItem.setUpdateBy(source.getUpdateBy());
-		userGroupItem.setDelFlag(source.getDelFlag());
-		userGroupItem.setTenantId(source.getTenantId());
-		return userGroupItem;
-	}
-
 }
 

src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java

@@ -1,7 +1,6 @@
 package com.qs.serve.modules.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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.modules.biz.consts.GroupDataType;
@@ -17,10 +16,7 @@ import com.qs.serve.modules.sys.service.SysUserService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
-import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -938,7 +938,7 @@ public class BmsSupplierController {
             LambdaQueryWrapper<BmsRegion2> bmsRegion2LambdaQueryWrapper = new LambdaQueryWrapper<>();
             bmsRegion2LambdaQueryWrapper.in(BmsRegion2::getPathNames,bmsBizRegionNames);
             bizRegionList = bmsRegion2Service.list(bmsRegion2LambdaQueryWrapper);
-            List<String> exsitBizRegeionName = bizRegionList.stream().map(a->a.getName()).collect(Collectors.toList());
+            List<String> exsitBizRegeionName = bizRegionList.stream().map(BmsRegion2::getPathNames).collect(Collectors.toList());
             if(bizRegionList.size()<bmsBizRegionNames.size()){
                 param.forEach(a->{
                     if(a.getType().equals("4")){

src/main/java/com/qs/serve/modules/data/entity/DataAffairCommit.java

@@ -48,7 +48,7 @@ public class DataAffairCommit implements Serializable {
     /** 释放费用 */
     private Integer releaseFlag;
 
-    /** 状态：0-否定，1-同意，2-退回 */
+    /** 状态：0-否定，1-同意，2-退回,3->加签 */
     private Integer state;
 
     /** 用户id */

src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeParam.java

@@ -31,4 +31,7 @@ public class CtpAddNodeParam {
      */
     String comment;
 
+    /** 附件id */
+    private String[] attachIds;
+
 }

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

@@ -96,6 +96,19 @@ public interface SeeYonOperationService extends SeeYonBaseService{
      */
     default R<String> addNode(CtpAddNodeParam param){
         getRequestService().testConnection();
+        //获取当前最新的affairId
+        List<CtpAffairVo> rList = this.pageAffair(param.getTargetId()).getData();
+        String affairId = null;
+        if(rList.size()>0){
+            CtpAffair affair = rList.get(0).getAffairInfo();
+            if(affair!=null){
+                affairId = affair.getAffairId();
+            }
+        }
+        if(affairId==null&&param.getAttachIds()!=null&&param.getAttachIds().length>0){
+            return R.error("附件上传失败(如果急需提交请移除附件)");
+        }
+
         CtpAddNodeDTO addNodeDTO = new CtpAddNodeDTO();
         addNodeDTO.setBackToMe(param.getBackToMe());
         addNodeDTO.setTargetId(param.getTargetId());
@@ -121,6 +134,21 @@ public interface SeeYonOperationService extends SeeYonBaseService{
         addNodeDTO.setComment(param.getComment());
         R<String> result = getRequestService().addNode(addNodeDTO);
         if(result.getData()!=null&&result.getData().toLowerCase(Locale.ROOT).contains("ok")){
+            DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class);
+            DataAffairCommit dataAffairCommit = new DataAffairCommit();
+            dataAffairCommit.setTargetCode(getTemplateCode());
+            dataAffairCommit.setTargetId(param.getTargetId());
+
+            dataAffairCommit.setId(affairId);
+            dataAffairCommit.setCommentVal("加签:"+param.getComment());
+            dataAffairCommit.setReleaseFlag(0);
+            dataAffairCommit.setState(3);
+            dataAffairCommit.setUserId(sysUser.getId());
+            dataAffairCommit.setUserCode(sysUser.getCode());
+            dataAffairCommit.setUserName(sysUser.getName());
+            dataAffairCommit.setResultData("addNode");
+            dataAffairCommit.setAttachIds(param.getAttachIds());
+            dataAffairCommitMapper.insert(dataAffairCommit);
             return R.ok();
         }
         return R.error(result.getMsg());

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

@@ -71,8 +71,12 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
         costApply.setChangeSourceId(null);
         costApply.setChangeExtendId(null);
         costApply.setCancelFlag(null);
+        costApply.setTotalActivityUsedAmount(null);
+        costApply.setCancelFlag(null);
         costApply.setEditAmountFlag(null);
         costApply.setChargeState(TbsCostApplyState.State_0_unPublish.getCode());
+        costApply.setChangeActionTime(null);
+        costApply.setChangeStateRecord(null);
         tbsCostApplyService.save(costApply);
         final Long newCostApplyId = costApply.getId();
 
@@ -234,6 +238,14 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
             orgActivity.setCreateTime(null);
             orgActivity.setUpdateTime(null);
             orgActivity.setUpdateBy(null);
+            orgActivity.setUsedAmount(null);
+            orgActivity.setReleaseAmount(null);
+            orgActivity.setCancelFlag(null);
+            orgActivity.setReopenFlag(null);
+            orgActivity.setFinishedFlag(null);
+            orgActivity.setFinishedTime(null);
+            orgActivity.setCostPassFlag(null);
+            orgActivity.setReleaseFlag(null);
             tbsActivityMapper.insert(orgActivity);
             final Long newActivityId = orgActivity.getId();