Przeglądaj źródła

政策-公司主体id修改为公司id

yangzian 3 lat temu
rodzic
commit
73cc67b4d5

+ 2 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -411,7 +411,7 @@ public class CwjsPolicyInfoController {
 			JSONObject examineUser = new JSONObject();
 			String directorUserId = "";
 			//主体为1 为 华北
-			if (cwjsPolicy.getCompanySubjectId() == 1){
+			if (cwjsPolicy.getCompanyId().equals("d57fecdcf7a94d009736d9c850731582")){
 				//查询 该销售 所属的审核人员
 				//华北审核人员 - 法务==>销售总监(销售上级)==>手动转领导/自动转领导
 				examineUser = cwjsPolicyInfoMapper.getUserLeaderAndDirectorByRoleName(cwjsPolicy.getSaleId(),"法务");
@@ -437,7 +437,7 @@ public class CwjsPolicyInfoController {
 
 						if(examineUser.getString("departName").contains("销售")){
 							//华北
-							if (cwjsPolicy.getCompanySubjectId() == 1){
+							if (cwjsPolicy.getCompanyId().equals("d57fecdcf7a94d009736d9c850731582")){
 								//查询 是否符合自动转审条件
 								List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicy.getAccountingPeriod(),cwjsPolicy.getMediaType(),
 										cwjsPolicy.getAdvancePay(),cwjsPolicy.getRebateType(),cwjsPolicy.getRebateRate());

+ 3 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/entity/CwjsPolicyInfo.java

@@ -51,6 +51,9 @@ public class CwjsPolicyInfo implements Serializable{
 	@Excel(name = "我司主体", width = 15)
     @ApiModelProperty(value = "我司主体")
 	private Integer companySubjectId;
+
+	@TableField(exist = false)
+	private String companyId;
 	/**集团简称*/
 	@Excel(name = "集团简称", width = 15)
     @ApiModelProperty(value = "集团简称")

+ 2 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml

@@ -8,7 +8,8 @@
         select t1.policy_product_name as productName,t2.* ,
                (select u.realname from sys_user u where u.id = t2.sale_id) as saleName,
                 sub.company_subject_name CompanySubjectName,
-               sub.area_info as areaInfo
+               sub.area_info as areaInfo,
+        sub.company_id as companyId
         from ctop_cwjs_policy_product t1
             LEFT JOIN ctop_cwjs_policy_info t2 on t1.policy_id = t2.id
         LEFT JOIN ctop_cwjs_company_subject sub on sub.id = t2.company_subject_id