diff --git a/app.irbs/src/main/resources/META-INF/platform/plugins/liquibase.json b/app.irbs/src/main/resources/META-INF/platform/plugins/liquibase.json index 50e1203..1629dc9 100644 --- a/app.irbs/src/main/resources/META-INF/platform/plugins/liquibase.json +++ b/app.irbs/src/main/resources/META-INF/platform/plugins/liquibase.json @@ -16,9 +16,9 @@ "order" : 9000, "description":"授权与认证相关数据库表结构", "locations":[ - "liquibase/20240326_ALL_TABLES_DDL.xml", - "liquibase/20240401_REPORTS_TABLES_DDL.xml", - "liquibase/20240401_REPORTS_VIEW.xml" + "classpath:/liquibase/20240326_ALL_TABLES_DDL.xml", + "classpath:/liquibase/20240401_REPORTS_TABLES_DDL.xml", + "classpath:/liquibase/20240401_REPORTS_VIEW.xml" ] }, { @@ -26,7 +26,7 @@ "order" : 999999999, "description":"所有表的初始化数据", "locations":[ - "liquibase/IRBS_20240627_DATA.xml" + "classpath:/liquibase/IRBS_20240627_DATA.xml" ] } ] \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b69f6ec..9536b6f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.1 platform_group=io.sc platform_version=8.1.44 platform_plugin_version=8.1.44 -platform_core_frontend_version=8.1.279 +platform_core_frontend_version=8.1.281 ########################################################### # product dependencies version diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/controller/CompanyRatingController.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/controller/CompanyRatingController.java index ede27ff..ca0c5bd 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/controller/CompanyRatingController.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/controller/CompanyRatingController.java @@ -30,6 +30,17 @@ public class CompanyRatingController extends RestCrudController getMonthRatingLimit(@PathVariable(name="custNo") String custNo) throws Exception { + return service.isOverMonthLimit(custNo); + } + /** * 生成评级数据 * @param custNo @@ -75,11 +86,12 @@ public class CompanyRatingController extends RestCrudController indices) throws Exception { - return service.qualSaveIndices(indices); + @RequestMapping(value="qualSaveIndices/{flag}",method= RequestMethod.POST) + public Map qualSaveIndices(@PathVariable(name="flag") String flag, @RequestBody List indices) throws Exception { + return service.qualSaveIndices(flag, indices); } /** diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/repository/CompanyRatingRepository.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/repository/CompanyRatingRepository.java index d6baa10..813eda4 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/repository/CompanyRatingRepository.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/repository/CompanyRatingRepository.java @@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import java.util.Date; import java.util.List; public interface CompanyRatingRepository extends DaoRepository { @@ -19,4 +20,6 @@ public interface CompanyRatingRepository extends DaoRepository findByCustNoAndRatingStatus(String custNo, String ratingStatus); List findByCustNoAndProcessStatusOrderByEffectiveTimeAsc(String custNo, String ratingStatus); + + List findByCustNoAndCreateDateBetween(String custNo,Date startDt, Date endDt); } diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/CompanyRatingService.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/CompanyRatingService.java index ac2918a..585ff7d 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/CompanyRatingService.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/CompanyRatingService.java @@ -29,7 +29,7 @@ public interface CompanyRatingService extends DaoService indices) throws Exception; + public Map qualSaveIndices(String flag, List indices) throws Exception; public CompanyRating stepInitRating(String ratingId, String page) throws Exception; @@ -56,4 +56,6 @@ public interface CompanyRatingService extends DaoService getSystemParameters(String[] codes) throws Exception; public String removeRatingAndProcess(String ratingId) throws Exception; + + public Map isOverMonthLimit(String custNo) throws Exception; } diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyCustomerServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyCustomerServiceImpl.java index 4b92182..8ac994d 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyCustomerServiceImpl.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyCustomerServiceImpl.java @@ -2,6 +2,7 @@ package irbs.cust.rating.service.impl; import io.sc.platform.orm.service.impl.DaoServiceImpl; import io.sc.platform.orm.service.support.QueryParameter; +import io.sc.platform.orm.service.support.criteria.Criteria; import io.sc.platform.orm.util.EntityVoUtil; import irbs.cust.rating.jpa.entity.CompanyCustomer; import irbs.cust.rating.jpa.entity.Industry; diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingProcessServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingProcessServiceImpl.java index a0f2b85..2079ff4 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingProcessServiceImpl.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingProcessServiceImpl.java @@ -109,6 +109,8 @@ public class CompanyRatingProcessServiceImpl implements CompanyRatingProcessServ } } else if(opaVal < 0){ companyRatingService.backStart(instance.getBusinessKey(), processProperties.getData()); + } else if(opaVal == RatingGoBackType.APPROVE.code()) { + companyRatingService.approve(instance.getBusinessKey(), processProperties.getData()); } else { companyRatingService.submit(instance.getBusinessKey(), processProperties.getData()); } diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingServiceImpl.java index 08157a8..2420874 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingServiceImpl.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/CompanyRatingServiceImpl.java @@ -359,13 +359,35 @@ public class CompanyRatingServiceImpl extends DaoServiceImpl isOverMonthLimit(String custNo) throws Exception { + Map map = new HashMap<>(); + Calendar start = Calendar.getInstance(); + start.set(Calendar.DAY_OF_MONTH,1); + start.set(Calendar.HOUR_OF_DAY,0); + start.set(Calendar.MINUTE,0); + start.set(Calendar.SECOND,0); + Calendar end = Calendar.getInstance(); + List list = repository.findByCustNoAndCreateDateBetween(custNo, start.getTime(), end.getTime()); + int num = Integer.parseInt(systemParameterService.getParameter("parameter.irbs.params.monthRatingNum")); + Boolean result = false; + if(list!=null && list.size() >= num) { + result = true; + String tactics = systemParameterService.getParameter("parameter.irbs.params.monthRatingNum.tactics"); + map.put("tactics", tactics); + map.put("num", num); + } + map.put("result", result); + return map; + } + private String isCustomerDefault(String custNo) throws Exception { Integer num = defaultCognizanceService.getDefaultNum(custNo); if(num > 0) { @@ -403,7 +425,8 @@ public class CompanyRatingServiceImpl extends DaoServiceImpl indices) throws Exception { + public Map qualSaveIndices(String flag, List indices) throws Exception { + Map map = new HashMap<>(); boolean tag = false; if(null!=indices && indices.size()>0){ List ids = indices.stream().map(RatingIndex::getId).collect(Collectors.toList()); @@ -419,21 +442,27 @@ public class CompanyRatingServiceImpl extends DaoServiceImpl - + @@ -62,7 +62,7 @@ - + @@ -87,8 +87,8 @@ - - + + diff --git a/irbs.defaultManager/src/main/java/irbs/defaultManager/jpa/entity/RatingEntity.java b/irbs.defaultManager/src/main/java/irbs/defaultManager/jpa/entity/RatingEntity.java index 5931cb1..df6d8fc 100644 --- a/irbs.defaultManager/src/main/java/irbs/defaultManager/jpa/entity/RatingEntity.java +++ b/irbs.defaultManager/src/main/java/irbs/defaultManager/jpa/entity/RatingEntity.java @@ -33,13 +33,13 @@ public class RatingEntity extends CorporationAuditorEntity { protected String custId; // 客户编号 - @Column(name="CUST_NO") - @Size(max=100) + @Column(name="CUSTOMER_ID") + @Size(max=12) protected String custNo; // 客户中文名称 - @Column(name="CUST_NAME") - @Size(max=200) + @Column(name="CUSTOMER_CHINESE_NAME") + @Size(max=90) protected String custName; // 客户类别(1:一般公司客户;2:金融机构及发债企业客户) diff --git a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultRebirthServiceImpl.java b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultRebirthServiceImpl.java index 43b7437..0e01780 100644 --- a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultRebirthServiceImpl.java +++ b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/impl/DefaultRebirthServiceImpl.java @@ -180,8 +180,10 @@ public class DefaultRebirthServiceImpl extends DaoServiceImpl queryCognizanceList(QueryParameter queryParameter) throws Exception { Map> fieldTypeMap = new HashMap<>(); fieldTypeMap.put("VALID", java.lang.String.class); + fieldTypeMap.put("CUST_NO", java.lang.String.class); + fieldTypeMap.put("CUST_NAME", java.lang.String.class); StringBuffer sql = new StringBuffer(); - sql.append("select T1.* from P_IRS_DEFAULT_COGNIZANCE T1 JOIN IRBS_CUST_CP_INFO T2 on T1.CUST_NO=T2.CUST_NO "); + sql.append("select T1.* from P_IRS_DEFAULT_COGNIZANCE T1 JOIN IRBS_CUST_CP_INFO T2 on T1.CUST_NO=T2.CUSTOMER_ID "); Condition condition = jdbcTemplateService.buildCondition(fieldTypeMap, queryParameter); String conditionSql = " where 1=1 "; if (null!=condition.getWhere() && !"".equals(condition.getWhere())) { diff --git a/irbs.defaultManager/src/main/resources/META-INF/platform/plugins/liquibase.json b/irbs.defaultManager/src/main/resources/META-INF/platform/plugins/liquibase.json index 6329fe8..a151220 100644 --- a/irbs.defaultManager/src/main/resources/META-INF/platform/plugins/liquibase.json +++ b/irbs.defaultManager/src/main/resources/META-INF/platform/plugins/liquibase.json @@ -29,9 +29,9 @@ "order" : 9000, "description":"违约管理相关表结构", "locations":[ - "liquibase/20240327_DEFAULT_DDL.xml", - "liquibase/20240622_DEFAULT_DDL.xml", - "liquibase/20240722_DEFAULT_DDL.xml" + "classpath:/liquibase/20240327_DEFAULT_DDL.xml", + "classpath:/liquibase/20240622_DEFAULT_DDL.xml", + "classpath:/liquibase/20240722_DEFAULT_DDL.xml" ] } ] diff --git a/irbs.deptRating/src/main/resources/META-INF/platform/plugins/liquibase.json b/irbs.deptRating/src/main/resources/META-INF/platform/plugins/liquibase.json index d663f5a..cd83f03 100644 --- a/irbs.deptRating/src/main/resources/META-INF/platform/plugins/liquibase.json +++ b/irbs.deptRating/src/main/resources/META-INF/platform/plugins/liquibase.json @@ -29,7 +29,7 @@ "order" : 110000, "description":"风险暴露分类", "locations":[ - "liquibase/20240427_DEBTRATING_DDL.xml" + "classpath:/liquibase/20240427_DEBTRATING_DDL.xml" //"liquibase/20240711_DEBTRATING_DDL.xml" ] } diff --git a/irbs.feature/src/main/resources/META-INF/platform/plugins/liquibase.json b/irbs.feature/src/main/resources/META-INF/platform/plugins/liquibase.json index 495a5b2..943d809 100644 --- a/irbs.feature/src/main/resources/META-INF/platform/plugins/liquibase.json +++ b/irbs.feature/src/main/resources/META-INF/platform/plugins/liquibase.json @@ -17,8 +17,8 @@ "order" : 999999, "description":"客户特征变量结果相关表", "locations":[ - "liquibase/20240630_FEATURE_DDL.xml", - "liquibase/20240702_FEATURE_DDL.xml" + "classpath:/liquibase/20240630_FEATURE_DDL.xml", + "classpath:/liquibase/20240702_FEATURE_DDL.xml" ] } ] diff --git a/irbs.feature/src/main/resources/liquibase/20240630_FEATURE_DDL.xml b/irbs.feature/src/main/resources/liquibase/20240630_FEATURE_DDL.xml index e59bd55..26c9858 100644 --- a/irbs.feature/src/main/resources/liquibase/20240630_FEATURE_DDL.xml +++ b/irbs.feature/src/main/resources/liquibase/20240630_FEATURE_DDL.xml @@ -9,16 +9,16 @@ - + - - - - - - - + + + + + + + @@ -31,18 +31,18 @@ - + - - - - - - - - - + + + + + + + + + @@ -55,14 +55,14 @@ - + - - - - - + + + + + @@ -77,14 +77,14 @@ - + - - - - - + + + + + diff --git a/irbs.financialTemplate/src/main/resources/META-INF/platform/plugins/liquibase.json b/irbs.financialTemplate/src/main/resources/META-INF/platform/plugins/liquibase.json index 56f0f5b..53ffffb 100644 --- a/irbs.financialTemplate/src/main/resources/META-INF/platform/plugins/liquibase.json +++ b/irbs.financialTemplate/src/main/resources/META-INF/platform/plugins/liquibase.json @@ -17,7 +17,7 @@ "order" : 100010, "description":"授权与认证相关数据库表结构", "locations":[ - "liquibase/20240712_FINANCIALTEMPLATE_DDL.xml" + "classpath:/liquibase/20240712_FINANCIALTEMPLATE_DDL.xml" ] } ] diff --git a/irbs.frontend/package.json b/irbs.frontend/package.json index e76c24c..69dd480 100644 --- a/irbs.frontend/package.json +++ b/irbs.frontend/package.json @@ -78,7 +78,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.279", + "platform-core": "8.1.281", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31", diff --git a/irbs.frontend/src/views/custRating/CustRating.vue b/irbs.frontend/src/views/custRating/CustRating.vue index 81fe64f..f12f97a 100644 --- a/irbs.frontend/src/views/custRating/CustRating.vue +++ b/irbs.frontend/src/views/custRating/CustRating.vue @@ -12,9 +12,19 @@ :columns="companyRatingGrid.columns" :toolbar-actions="companyRatingGrid.buttons" :query-criteria="{ - fieldName: 'triggerType', - operator: 'equals', - value: 'INDEPENDENT', + operator: 'and', + criteria: [ + { + fieldName: 'triggerType', + operator: 'equals', + value: 'INDEPENDENT', + }, + { + fieldName: 'launchUser', + operator: 'equals', + value: SessionManager.getUser().loginName, + }, + ], }" :sort-by="['-createDate']" > @@ -27,7 +37,7 @@