From aa7859c3fe1f879cdb62950219130edac7612363 Mon Sep 17 00:00:00 2001 From: likunming Date: Wed, 3 Jul 2024 07:32:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=80=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liquibase/data/irbs/SYS_DICTIONARY.csv | 1 - gradle.properties | 2 +- .../rating/controller/HomeController.java | 12 ++ .../rating/jpa/entity/CompanyCustomer.java | 14 +- .../rating/jpa/support/HomeTotalWrapper.java | 66 ++++++++ .../irbs/cust/rating/service/HomeService.java | 3 + .../impl/CompanyCustomerServiceImpl.java | 6 +- .../rating/service/impl/HomeServiceImpl.java | 40 ++++- .../controller/DefaultRebirthController.java | 8 + .../service/DefaultRebirthService.java | 4 + .../impl/DefaultRebirthServiceImpl.java | 25 ++- .../controller/AppDebtRatingController.java | 12 +- irbs.frontend/src/views/IrbsHome.vue | 153 ++++++++++++++++-- .../src/views/custRating/CustRating.vue | 9 ++ .../src/views/custRating/RatingDialog.vue | 10 +- .../src/views/debtRating/LgdQuery.vue | 60 +++++-- .../src/views/default/CognizanceApply.vue | 7 +- .../src/views/default/CognizanceDialog.vue | 15 +- .../src/views/default/RebirthApply.vue | 25 ++- .../src/views/default/RebirthDialog.vue | 15 +- .../src/views/workbench/DoneTask.vue | 3 +- irbs.frontend/src/views/workbench/EndTask.vue | 3 +- .../src/views/workbench/TodoTask.vue | 3 +- 23 files changed, 412 insertions(+), 84 deletions(-) create mode 100644 irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/support/HomeTotalWrapper.java diff --git a/app.irbs/src/main/resources/liquibase/data/irbs/SYS_DICTIONARY.csv b/app.irbs/src/main/resources/liquibase/data/irbs/SYS_DICTIONARY.csv index 8fb7b2e..41e2950 100644 --- a/app.irbs/src/main/resources/liquibase/data/irbs/SYS_DICTIONARY.csv +++ b/app.irbs/src/main/resources/liquibase/data/irbs/SYS_DICTIONARY.csv @@ -3,7 +3,6 @@ "ID","字典代码","字典项值","排序","JPA乐观锁版本","数据来源(INPUT:手工录入,IMPORT:系统自动导入)","创建人","创建日期","最后修改人","最后修改日期","所属法人代码" "VARCHAR","VARCHAR","VARCHAR","INTEGER","INTEGER","VARCHAR","VARCHAR","TIMESTAMP","VARCHAR","TIMESTAMP","VARCHAR" "java.lang.String","java.lang.String","java.lang.String","java.lang.Integer","java.lang.Integer","java.lang.String","java.lang.String","java.sql.Timestamp","java.lang.String","java.sql.Timestamp","java.lang.String" -"05535cb1-d9c4-49fb-bde1-405fce601ac3","WORK_FLOW","SAMPLE","1",,"INPUT","system","2024-03-11 12:50:35.0","system","2024-03-11 12:50:35.0","_PRIMARY_" "debe6a2c-da11-46f9-a77d-28481e1da319","WORK_FLOW","RULE_ENGINE_APPROVING","2",,"INPUT","system","2024-03-11 12:50:35.0","system","2024-03-11 12:50:35.0","_PRIMARY_" "098b04c2-0ce7-440d-8f4d-edd665b84d9b","NATION_CD","208","208",,"INPUT","test01","2024-06-26 15:33:33.0","test01","2024-06-26 15:33:33.0","_PRIMARY_" "102f43a1-588c-4890-bef1-a54b5ac18394","NATION_CD","999","999",,"INPUT","test01","2024-06-26 15:34:00.0","test01","2024-06-26 15:34:00.0","_PRIMARY_" diff --git a/gradle.properties b/gradle.properties index febc166..551f1fc 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.242 +platform_core_frontend_version=8.1.254 ########################################################### # product dependencies version diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/controller/HomeController.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/controller/HomeController.java index dabd76b..bb9db00 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/controller/HomeController.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/controller/HomeController.java @@ -1,5 +1,6 @@ package irbs.cust.rating.controller; +import irbs.cust.rating.jpa.support.HomeTotalWrapper; import irbs.cust.rating.jpa.support.KeyValueWrapper; import irbs.cust.rating.service.HomeService; import org.springframework.beans.factory.annotation.Autowired; @@ -21,6 +22,17 @@ public class HomeController { @Autowired private HomeService homeService; + /** + * 首页，敞口分布统计 + * + * @throws Exception 异常 + */ + @RequestMapping(value = "getTotalInfo", method = RequestMethod.GET) + @ResponseBody + public HomeTotalWrapper getTotalInfo() throws Exception { + return homeService.getTotalInfo(); + } + /** * 首页，敞口分布统计 * diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/entity/CompanyCustomer.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/entity/CompanyCustomer.java index b81a3e2..69096b9 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/entity/CompanyCustomer.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/entity/CompanyCustomer.java @@ -75,8 +75,9 @@ public class CompanyCustomer extends CorporationAuditorEntity /** * 国标行业 */ - @Column(name="INDU_SORT_CD") - private String induSortCd; + @ManyToOne(targetEntity = Industry.class, fetch=FetchType.LAZY) + @JoinColumn(name="INDU_SORT_CD", referencedColumnName="CODE_") + private Industry induSortCd; /** * 客户类型 @@ -182,7 +183,10 @@ public class CompanyCustomer extends CorporationAuditorEntity vo.setMgerOrgNm(this.getMgerOrgNm()); vo.setOrgnCd(this.getOrgnCd()); vo.setOrgCrdtCd(this.getOrgCrdtCd()); - vo.setInduSortCd(this.getInduSortCd()); + if (null != this.getInduSortCd()) { + vo.setInduSortCd(this.getInduSortCd().getCode()); + vo.setInduSortName(this.getInduSortCd().getName()); + } vo.setCustTypeCd(this.getCustTypeCd()); vo.setCustSortCd(this.getCustSortCd()); vo.setBuildDt(this.getBuildDt()); @@ -272,11 +276,11 @@ public class CompanyCustomer extends CorporationAuditorEntity this.orgCrdtCd = orgCrdtCd; } - public String getInduSortCd() { + public Industry getInduSortCd() { return induSortCd; } - public void setInduSortCd(String induSortCd) { + public void setInduSortCd(Industry induSortCd) { this.induSortCd = induSortCd; } diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/support/HomeTotalWrapper.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/support/HomeTotalWrapper.java new file mode 100644 index 0000000..f896438 --- /dev/null +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/jpa/support/HomeTotalWrapper.java @@ -0,0 +1,66 @@ +package irbs.cust.rating.jpa.support; + +import org.springframework.jdbc.core.RowMapper; + +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; + +/** + * 首页统计面板wrapper + */ +public class HomeTotalWrapper { + + private Integer waitTask; // 待办任务数量 + private Integer completeTask; // 已办任务数量 + private Integer endTask; // 办结任务数量 + private BigDecimal ratingUpdate; // 评级更新完成率 + + public static RowMapper getRowMapper() { + return new HomeTotalWrapperRowMapper(); + } + + public static class HomeTotalWrapperRowMapper implements RowMapper { + @Override + public HomeTotalWrapper mapRow(ResultSet rs, int rowNum) throws SQLException { + HomeTotalWrapper wrapper = new HomeTotalWrapper(); + wrapper.setWaitTask(rs.getInt("WAIT_TASK")); + wrapper.setCompleteTask(rs.getInt("COMPLETE_TASK")); + wrapper.setEndTask(rs.getInt("END_TASK")); + wrapper.setRatingUpdate(rs.getBigDecimal("RATING_UPDATE")); + return wrapper; + } + } + + public Integer getWaitTask() { + return waitTask; + } + + public void setWaitTask(Integer waitTask) { + this.waitTask = waitTask; + } + + public Integer getCompleteTask() { + return completeTask; + } + + public void setCompleteTask(Integer completeTask) { + this.completeTask = completeTask; + } + + public Integer getEndTask() { + return endTask; + } + + public void setEndTask(Integer endTask) { + this.endTask = endTask; + } + + public BigDecimal getRatingUpdate() { + return ratingUpdate; + } + + public void setRatingUpdate(BigDecimal ratingUpdate) { + this.ratingUpdate = ratingUpdate; + } +} diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/HomeService.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/HomeService.java index 0ec6b9c..4be6707 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/HomeService.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/HomeService.java @@ -1,5 +1,6 @@ package irbs.cust.rating.service; +import irbs.cust.rating.jpa.support.HomeTotalWrapper; import irbs.cust.rating.jpa.support.KeyValueWrapper; import java.util.List; @@ -11,6 +12,8 @@ import java.util.List; */ public interface HomeService { + public HomeTotalWrapper getTotalInfo() throws Exception; + public List getRatingModelExposureList() throws Exception; public List getRatingLevelExposureList() 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 27b69e9..4b92182 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 @@ -24,9 +24,9 @@ public class CompanyCustomerServiceImpl extends DaoServiceImpl page = super.query(queryParameter); if (null != page.getContent() && page.getContent().size() > 0) { for (CompanyCustomer customer: page.getContent()) { - Industry industry = industryService.getRepository().findByCode(customer.getInduSortCd()); - if (null != industry) { - customer.setInduSortName(industry.getName()); +// Industry industry = industryService.getRepository().findByCode(); + if (null != customer.getInduSortCd()) { + customer.setInduSortName(customer.getInduSortCd().getName()); } } } diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/HomeServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/HomeServiceImpl.java index d95b009..892356e 100644 --- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/HomeServiceImpl.java +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/HomeServiceImpl.java @@ -1,20 +1,58 @@ package irbs.cust.rating.service.impl; +import io.sc.platform.security.util.SecurityUtil; +import irbs.cust.rating.enums.RatingStatus; +import irbs.cust.rating.jpa.support.HomeTotalWrapper; import irbs.cust.rating.jpa.support.KeyValueWrapper; import irbs.cust.rating.service.HomeService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; import java.util.Map; @Service public class HomeServiceImpl implements HomeService { + private static final RowMapper HomeTotalWrapperRowMapper = HomeTotalWrapper.getRowMapper(); + @Autowired NamedParameterJdbcTemplate namedParameterJdbcTemplate; + @Override + public HomeTotalWrapper getTotalInfo() throws Exception { + BigDecimal ratingUpdate = BigDecimal.ZERO; // 评级更新完成率 + String fzSql = "select count(1) as countN from ns_company_rating where trigger_type = 'UPDATE' and final_level is not null "; + String fmSql = "select count(1) as countN from ns_company_rating where trigger_type = 'UPDATE' "; + Integer fz = namedParameterJdbcTemplate.queryForObject(fzSql, new HashMap<>(), Integer.class); + Integer fm = namedParameterJdbcTemplate.queryForObject(fmSql, new HashMap<>(), Integer.class); + if(fz != null && fm != null && fm != 0){ + ratingUpdate = BigDecimal.valueOf(fz,4).divide(BigDecimal.valueOf(fm,4),4,4).multiply(BigDecimal.valueOf(100)).setScale(2,4); + } + String sql = "SELECT COUNT(DISTINCT wait_task) AS wait_task "; + sql += ",COUNT(DISTINCT complete_task) AS complete_task "; + sql += ",COUNT(DISTINCT end_task) AS end_task "; + sql += ",0 AS rating_update "; + sql += "FROM ( "; + sql += "SELECT CASE WHEN T.ASSIGNEE_ = :assignee THEN T.ID_ ELSE NULL END AS wait_task "; + sql += ",CASE WHEN HT.ASSIGNEE_ = :assignee AND HT.END_TIME_ IS NOT NULL AND T.ID_ IS NOT NULL THEN HT.PROC_INST_ID_ ELSE NULL END AS complete_task "; + sql += ",CASE WHEN HT.ASSIGNEE_ = :assignee AND HT.END_TIME_ IS NOT NULL AND hp.end_time_ is not null and hp.end_act_id_ is not null THEN HT.PROC_INST_ID_ ELSE NULL END AS end_task "; + sql += "FROM ACT_HI_TASKINST HT "; + sql += "LEFT JOIN ACT_RU_TASK T ON T.PROC_INST_ID_ = HT.PROC_INST_ID_ "; + sql += "LEFT JOIN ACT_HI_PROCINST hp ON hp.proc_inst_id_ = HT.proc_inst_id_) "; + Map params = new HashMap<>(); + params.put("assignee", SecurityUtil.getLoginName()); + List res = namedParameterJdbcTemplate.query(sql, params, HomeTotalWrapperRowMapper); + if(res.size()==1){ + res.get(0).setRatingUpdate(ratingUpdate); + } + return res.get(0); + } + @Override public List getRatingModelExposureList() throws Exception { String querySql = "select MODEL_NAME, count(*) MODEL_NUMBER from NS_COMPANY_RATING where MODEL_CODE IS NOT NULL "; @@ -33,7 +71,7 @@ public class HomeServiceImpl implements HomeService { public List getRatingLevelExposureList() throws Exception { String querySql1 = "select p.FINAL_LEVEL,count(*) FINAL_NUMBER from (" + "select distinct(cust_no) as cust_no,FINAL_LEVEL from NS_COMPANY_RATING " + - "WHERE cust_no is not null and FINAL_LEVEL IS NOT NULL AND RATING_STATUS = '010' "; + "WHERE cust_no is not null and FINAL_LEVEL IS NOT NULL AND RATING_STATUS = '"+ RatingStatus.EFFECTIVE.name() +"' "; String querySql2 = "select 'D' FINAL_LEVEL, COUNT(*) FINAL_NUMBER from (" + "select distinct(cust_no) as cust_no from P_IRS_DEFAULT_COGNIZANCE " + "where ((VALID = '1' and DEFAULT_TYPE ='02') or (VALID <> '0' and DEFAULT_TYPE = '01')) and cust_no is not null "; diff --git a/irbs.defaultManager/src/main/java/irbs/defaultManager/controller/DefaultRebirthController.java b/irbs.defaultManager/src/main/java/irbs/defaultManager/controller/DefaultRebirthController.java index 4e3456e..542b926 100644 --- a/irbs.defaultManager/src/main/java/irbs/defaultManager/controller/DefaultRebirthController.java +++ b/irbs.defaultManager/src/main/java/irbs/defaultManager/controller/DefaultRebirthController.java @@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + @RestController @RequestMapping("/api/irbs/defaultRebirth") public class DefaultRebirthController extends RestCrudController { @@ -21,4 +23,10 @@ public class DefaultRebirthController extends RestCrudController pageQuery(QueryParameter queryParameter) throws Exception { return service.pageQuery(queryParameter); } + + @GetMapping("queryCognizanceList") + @ResponseBody + public Map queryCognizanceList(QueryParameter queryParameter) throws Exception { + return service.queryCognizanceList(queryParameter); + } } diff --git a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/DefaultRebirthService.java b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/DefaultRebirthService.java index c7ec91d..bfa1772 100644 --- a/irbs.defaultManager/src/main/java/irbs/defaultManager/service/DefaultRebirthService.java +++ b/irbs.defaultManager/src/main/java/irbs/defaultManager/service/DefaultRebirthService.java @@ -8,6 +8,8 @@ import irbs.defaultManager.jpa.repository.DefaultRebirthRepository; import irbs.defaultManager.jpa.vo.DefaultRebirthVo; import org.springframework.data.domain.Page; +import java.util.Map; + public interface DefaultRebirthService extends DaoService { public Page pageQuery(QueryParameter queryParameter) throws Exception; @@ -19,4 +21,6 @@ public interface DefaultRebirthService extends DaoService queryCognizanceList(QueryParameter queryParameter) throws Exception; } 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 ccfc466..43b7437 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 @@ -3,9 +3,11 @@ package irbs.defaultManager.service.impl; import io.sc.platform.flowable.controller.support.ProcessProperties; import io.sc.platform.flowable.service.ProcessQueryService; import io.sc.platform.flowable.support.ProcessTaskWrapper; +import io.sc.platform.jdbc.sql.condition.Condition; import io.sc.platform.orm.service.impl.DaoServiceImpl; import io.sc.platform.orm.service.support.QueryParameter; import io.sc.platform.orm.util.EntityVoUtil; +import io.sc.platform.page.config.service.JdbcTemplateService; import io.sc.platform.security.util.SecurityUtil; import irbs.defaultManager.constant.DefaultConstant; import irbs.defaultManager.enums.DefaultCustomerLogOperate; @@ -24,9 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; @Service("defaultRebirthService") @@ -44,6 +44,8 @@ public class DefaultRebirthServiceImpl extends DaoServiceImpl pageQuery(QueryParameter queryParameter) throws Exception { @@ -173,4 +175,21 @@ public class DefaultRebirthServiceImpl extends DaoServiceImpl queryCognizanceList(QueryParameter queryParameter) throws Exception { + Map> fieldTypeMap = new HashMap<>(); + fieldTypeMap.put("VALID", 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 "); + Condition condition = jdbcTemplateService.buildCondition(fieldTypeMap, queryParameter); + String conditionSql = " where 1=1 "; + if (null!=condition.getWhere() && !"".equals(condition.getWhere())) { + conditionSql += " and " + condition.getWhere(); + } + Map paramsMap = new HashMap(); + paramsMap = condition.getParameters(); + sql.append(conditionSql); + return jdbcTemplateService.listByConditionSql(queryParameter, sql.toString(), paramsMap); + } } diff --git a/irbs.deptRating/src/main/java/irbs/deptRating/controller/AppDebtRatingController.java b/irbs.deptRating/src/main/java/irbs/deptRating/controller/AppDebtRatingController.java index 3a466b5..7f60d4e 100644 --- a/irbs.deptRating/src/main/java/irbs/deptRating/controller/AppDebtRatingController.java +++ b/irbs.deptRating/src/main/java/irbs/deptRating/controller/AppDebtRatingController.java @@ -1,27 +1,31 @@ package irbs.deptRating.controller; +import io.sc.platform.mvc.controller.support.RestCrudController; import io.sc.platform.orm.service.support.QueryParameter; import irbs.deptRating.jpa.entity.AppDebtRating; +import irbs.deptRating.jpa.repository.AppDebtRatingRepository; +import irbs.deptRating.jpa.vo.AppDebtRatingVo; import irbs.deptRating.service.AppDebtRatingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; @Controller @RequestMapping("/api/irbs/appDebtRating") -public class AppDebtRatingController { - @Autowired - private AppDebtRatingService appDebtRatingService; +public class AppDebtRatingController extends RestCrudController { + /** * @债项评级管理 * @return */ @GetMapping("queryPage") + @ResponseBody public Page queryPage(QueryParameter queryParameter) throws Exception{ - Page page = appDebtRatingService.findAll(queryParameter); + Page page = service.findAll(queryParameter); return page; } } diff --git a/irbs.frontend/src/views/IrbsHome.vue b/irbs.frontend/src/views/IrbsHome.vue index 7c5e09a..6c04fb2 100644 --- a/irbs.frontend/src/views/IrbsHome.vue +++ b/irbs.frontend/src/views/IrbsHome.vue @@ -11,22 +11,32 @@
评级更新
- 0 + {{ state.totalInfo.waitTask }}
- 0 + {{ state.totalInfo.completeTask }}
- 0 + {{ state.totalInfo.endTask }}
- - 80% + + {{ state.totalInfo.ratingUpdate }}%
@@ -97,7 +107,7 @@ - + -
+
@@ -295,16 +366,27 @@ diff --git a/irbs.frontend/src/views/default/RebirthApply.vue b/irbs.frontend/src/views/default/RebirthApply.vue index 361551b..c60c766 100644 --- a/irbs.frontend/src/views/default/RebirthApply.vue +++ b/irbs.frontend/src/views/default/RebirthApply.vue @@ -10,15 +10,12 @@ :query-form-fields="rebirthGrid.queryFormFields" :columns="rebirthGrid.columns" :toolbar-actions="rebirthGrid.buttons" - :pagination="{ - sortBy: 'lastModifyDate', - descending: true, - }" :query-criteria="{ fieldName: 'defaultRebornType', operator: 'equals', value: '02', }" + :sort-by="['-lastModifyDate']" > { { fieldName: 'custNo', operator: 'equals', - value: row['custNo'], + value: row['CUST_NO'], }, { fieldName: 'rebirthProcessStatus', @@ -211,7 +208,7 @@ const launchRebirth = async () => { } else { // 发起 axios - .post(Environment.apiContextPath('api/irbs/defaultManager/rebirthApply'), { cognizanceId: row['id'], type: 'F' }) + .post(Environment.apiContextPath('api/irbs/defaultManager/rebirthApply'), { cognizanceId: row['ID_'], type: 'F' }) .then((resp) => { if (resp && resp['code'] === 200 && resp['data']) { rebirthLaunchDialogRef.value.hide(); diff --git a/irbs.frontend/src/views/default/RebirthDialog.vue b/irbs.frontend/src/views/default/RebirthDialog.vue index 4575628..87c720c 100644 --- a/irbs.frontend/src/views/default/RebirthDialog.vue +++ b/irbs.frontend/src/views/default/RebirthDialog.vue @@ -166,11 +166,12 @@ ]" > -
+
import { reactive, ref, nextTick } from 'vue'; -import { axios, Environment, NotifyManager, Tools, Formater, Options } from 'platform-core'; +import { axios, Environment, NotifyManager, Tools, DictionaryTools, Formater, Options } from 'platform-core'; import { DefaultEventItemStatus, DefaultEventItemOptions } from './DefaultManager.ts'; const dialogRef = ref(); @@ -234,7 +235,7 @@ const state = reactive({ const dialogHide = () => { state.status = 'edit'; - state.dialogTitle = '模拟计算'; + state.dialogTitle = '人工违约重生'; state.tab = 'cust'; }; @@ -257,10 +258,9 @@ const loadCustInfo = (data) => { state.custInfo.push({ label: '客户名称', value: custInfo['custName'] }); state.custInfo.push({ label: '客户经理编号', value: custInfo['mgerNo'] }); state.custInfo.push({ label: '客户经理名称', value: custInfo['mgerCna'] }); - state.custInfo.push({ label: '行业类型', value: custInfo['induSortCd'] }); - state.custInfo.push({ label: '客户类型', value: custInfo['custTypeCd'] }); + state.custInfo.push({ label: '行业类型', value: custInfo['induSortName'] }); state.custInfo.push({ label: '成立时间', value: custInfo['buildDt'] }); - state.custInfo.push({ label: '企业规模', value: custInfo['corpSizeCd'] }); + state.custInfo.push({ label: '企业规模', value: custInfo['corpSizeCd'], format: Formater.dictionary(dictCustomerSize) }); } }) .catch((error) => { @@ -283,4 +283,7 @@ defineExpose({ show, hide, }); + +const dictionaryArr = await DictionaryTools.fetch(['CustomerSizeCd']); +const dictCustomerSize = dictionaryArr['CustomerSizeCd']; diff --git a/irbs.frontend/src/views/workbench/DoneTask.vue b/irbs.frontend/src/views/workbench/DoneTask.vue index 1a9f4fe..49c2be5 100644 --- a/irbs.frontend/src/views/workbench/DoneTask.vue +++ b/irbs.frontend/src/views/workbench/DoneTask.vue @@ -12,9 +12,8 @@ :toolbar-actions="grid.buttons" :pagination="{ reqPageStart: 1, - sortBy: 'START_TIME', - descending: true, }" + :sort-by="['-START_TIME']" >
diff --git a/irbs.frontend/src/views/workbench/EndTask.vue b/irbs.frontend/src/views/workbench/EndTask.vue index 167929c..d2cc2e7 100644 --- a/irbs.frontend/src/views/workbench/EndTask.vue +++ b/irbs.frontend/src/views/workbench/EndTask.vue @@ -12,9 +12,8 @@ :toolbar-actions="grid.buttons" :pagination="{ reqPageStart: 1, - sortBy: 'START_TIME', - descending: true, }" + :sort-by="['-START_TIME']" >
diff --git a/irbs.frontend/src/views/workbench/TodoTask.vue b/irbs.frontend/src/views/workbench/TodoTask.vue index 20aabb7..59a5150 100644 --- a/irbs.frontend/src/views/workbench/TodoTask.vue +++ b/irbs.frontend/src/views/workbench/TodoTask.vue @@ -12,9 +12,8 @@ :toolbar-actions="grid.buttons" :pagination="{ reqPageStart: 1, - sortBy: 'CREATE_TIME', - descending: true, }" + :sort-by="['-START_TIME']" >