添加模板字段

src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java

@@ -174,6 +174,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
         return val!=null&&!val.equals("0");
     }
 
+    @Override
     public Float getYtdPercent(List<BirRoiCostItemVo> list){
         Float ytdPercent = null;
 
@@ -203,6 +204,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
         return ytdPercent;
     }
 
+    @Override
     public Float getQtdPercent(List<BirRoiCostItemVo> list){
         Float qtdPercent = null;
 
@@ -241,6 +243,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
     }
 
 
+    @Override
     public YtdQtdToOAVo buildYtdAndQtdData(TbsCostApply apply){
         YtdQtdToOAVo vo = new YtdQtdToOAVo();
         getYtdData(vo,apply.getSupplierId().toString(), apply.getUserId());

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

@@ -19,6 +19,9 @@ public class BaseCreateProcessBo {
     /** 标题 */
     private String subjectTitle;
 
+    /** 用于排除重复提交 */
+    private String targetId;
+
     private String dataJson;
 
     /** 致远附件id列表 */

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -267,6 +267,7 @@ public class TbsCostApplyController {
         if(activityTemplate.getTemplateState().equals(0)){
             return R.error("当前模板已停用");
         }
+        TbsActivityBo activityBo = param.getActivityBo();
         TbsCostApplyBo costApplyBo = param.getCostApplyBo();
         ValidateTools.valid(costApplyBo);
         TbsCostApply entity = CopierUtil.copy(costApplyBo,new TbsCostApply());
@@ -280,8 +281,9 @@ public class TbsCostApplyController {
         entity.setUserId(sysUser.getId());
         entity.setUserCode(sysUser.getCode());
         entity.setUserName(sysUser.getName());
+        entity.setTemplateTitle(activityBo.getTemplateTitle());
+        entity.setTemplateId(activityBo.getTemplateId());
         tbsCostApplyService.save(entity);
-        TbsActivityBo activityBo = param.getActivityBo();
         activityBo.setCostApplyId(entity.getId());
         ValidateTools.valid(activityBo);
         tbsActivityService.modify(activityBo);

src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java

@@ -186,9 +186,11 @@ public class TbsActivity implements Serializable {
     /** 模板值 */
     private String templateValue;
 
-    /** 模板ID */
+    /** 模板id */
     private Long templateId;
 
+    private String templateTitle;
+
     private String templateBudgetIds;
 
     /** 产品类型 */

src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java

@@ -58,6 +58,18 @@ public class TbsActivityTemplate implements Serializable {
     /** 合同类型:0->无；1->有合同 */
     private Integer contractFlag;
 
+    /** 费用申请主题 */
+    @Length(max = 255,message = "费用申请主题长度不能超过255字")
+    private String costTheme;
+
+    /** 费用申请主题能否编辑 */
+    private Integer costThemeEditFlag;
+
+    /** 预设备注 */
+    @Length(max = 255,message = "预设备注长度不能超过255字")
+    private String preRemark;
+
+
     /** 备注 */
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;

src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java

@@ -146,6 +146,8 @@ public class TbsCostApply implements Serializable {
     /** 模板id */
     private Long templateId;
 
+    private String templateTitle;
+
     @TableField(exist = false)
     private String affairId;
 

src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java

@@ -26,6 +26,9 @@ public class TbsActivityBo implements Serializable {
     /** id */
     private Long id;
 
+    /** 模板标题 */
+    private String templateTitle;
+
     /** 供应商id */
     private Long supplierId;
 

src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java

@@ -76,5 +76,17 @@ public class TbsActivityTemplateBo implements Serializable {
     @TableField(fill = FieldFill.UPDATE)
     private LocalDateTime endTime;
 
+    /** 费用申请主题 */
+    @Length(max = 255,message = "费用申请主题长度不能超过255字")
+    private String costTheme;
+
+    /** 费用申请主题能否编辑 */
+    private Integer costThemeEditFlag;
+
+    /** 预设备注 */
+    @Length(max = 255,message = "预设备注长度不能超过255字")
+    private String preRemark;
+
+
 }
 

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

@@ -350,6 +350,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         createProcess.setTemplateCode(TbsSeeYonConst.CostApplyConf.Code());
         createProcess.setMemberLoginName(sysUser.getSyAccount());
         createProcess.setSubjectTitle(TbsSeeYonConst.PRE_TITLE_COST_APPLY + tbsCostApply.getChargeTheme());
+        createProcess.setTargetId(tbsCostApply.getId()+"");
         createProcess.setDataJson(JsonUtil.objectToJson(data));
         R<String> flowIdResult = seeYonService.baseCreateProcess(createProcess);
         if(flowIdResult.getStatus()!=200){

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -202,6 +202,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
         createProcess.setTemplateCode(TbsSeeYonConst.PolicyConf.Code());
         createProcess.setMemberLoginName(sysUser.getSyAccount());
         createProcess.setSubjectTitle(TbsSeeYonConst.PRE_TITLE_COST_APPLY + tzcPolicy.getTitle());
+        createProcess.setTargetId(tzcPolicy.getId()+"");
         createProcess.setDataJson(JsonUtil.objectToJson(data));
         R<String> flowIdResult = seeYonService.baseCreateProcess(createProcess);
         if(flowIdResult.getStatus()!=200){

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -365,13 +365,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     }
 
 
-
-
     /**
      * 提交到致远审批流程
-     * @param actTitle
+     * @param activity
      * @param sysUser
      * @param verification
+     * @param saleRegionNames
+     * @param bizRegionNames
      */
     private void commitSy(TbsActivity activity,SysUser sysUser,VtbVerification verification,String saleRegionNames,String bizRegionNames){
         Map<String, Object> data = new HashMap<>(20);
@@ -423,6 +423,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         createProcess.setTemplateCode(TbsSeeYonConst.CostCheckConf.Code());
         createProcess.setMemberLoginName(sysUser.getSyAccount());
         createProcess.setSubjectTitle(TbsSeeYonConst.PRE_TITLE_VERIFICATION + verification.getRemark());
+        createProcess.setTargetId(verification.getId()+"");
         createProcess.setDataJson(JsonUtil.objectToJson(data));
         R<String> flowIdResult = seeYonService.baseCreateProcess(createProcess);
         if(flowIdResult.getStatus()!=200){