diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java index 426d5e47..96504369 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java @@ -174,6 +174,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl list){ Float ytdPercent = null; @@ -203,6 +204,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl list){ Float qtdPercent = null; @@ -241,6 +243,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl无;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; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java index d744fef4..7cad8aaf 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java +++ b/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; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java index 7a29eae1..5cc44d95 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java +++ b/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; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java index fd99251f..8254c1a7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java +++ b/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; + + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 1bad8836..a3e7c507 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -350,6 +350,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl flowIdResult = seeYonService.baseCreateProcess(createProcess); if(flowIdResult.getStatus()!=200){ diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index cc9c8606..c5888e62 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/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 flowIdResult = seeYonService.baseCreateProcess(createProcess); if(flowIdResult.getStatus()!=200){ diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index df91822f..c2489746 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -365,13 +365,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl data = new HashMap<>(20); @@ -423,6 +423,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl flowIdResult = seeYonService.baseCreateProcess(createProcess); if(flowIdResult.getStatus()!=200){