Skip to content

D
dsk-operate-sys-cscec
Commit acf688ee authored by yht15023815643's avatar yht15023815643
Browse files
Options

Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

parents 6ac0fba2 9329cca5
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 39 deletions
dsk-common/src/main/java/com/dsk/common/utils/CheckUtils.java
View file @ acf688ee
......@@ -52,7 +52,7 @@ public class CheckUtils {
* @return
*/
public static int checkIntegerPlaces(Double number) {
BigDecimal bigDecimal = new BigDecimal(number);
BigDecimal bigDecimal = new BigDecimal(String.valueOf(number));
String strNumber = bigDecimal.toString();
int integerPlaces = strNumber.indexOf('.');
if (integerPlaces == -1) {
......@@ -68,7 +68,7 @@ public class CheckUtils {
* @return
*/
public static int checkDecimalPlaces(Double number) {
BigDecimal bigDecimal = new BigDecimal(number);
BigDecimal bigDecimal = new BigDecimal(String.valueOf(number));
String strNumber = bigDecimal.toString();
int decimalPlaces = 0;
int index = strNumber.indexOf('.');
......
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ acf688ee
......@@ -11,7 +11,7 @@
<div class="writting" v-if="isEdit == true">
<div class="wri_top">
<img src="@/assets/images/project/add_3.png">
<el-input v-model="queryParam.task" placeholder="新建一条跟进记录，如:周五上午预约客户上门拜访"></el-input>
<el-input v-model="queryParam.task" maxlength="500" placeholder="新建一条跟进记录，如:周五上午预约客户上门拜访"></el-input>
</div>
<div class="wr_bot">
<div class="times"><img src="@/assets/images/project/ico_4.png">
......@@ -23,7 +23,7 @@
</div>
<div class="sels">
<img src="@/assets/images/project/ico_2.png">
<el-input v-model="queryParam.target" placeholder="拜访对象" maxlength="500" style="width: 100px;">
<el-input v-model="queryParam.target" placeholder="拜访对象" style="width: 100px;">
</el-input>
</div>
<div class="wc">
......@@ -111,6 +111,7 @@
businessId:this.detailId ? this.detailId : parseInt(this.$route.query.id),
pageSize:20,
pageNum:1,
state:0
},
datalist:[],
yqnum:'',//已逾期数量
......@@ -164,7 +165,6 @@
this.isSkeleton = true
let params={
...this.searchPram,
state:this.activeName === 'first'? 0 : this.activeName === 'second'? 1 : 2,
// cancelHttp: true
}
getGZDB(params).then(result=>{
......@@ -177,6 +177,7 @@
this.getList()
},
handleClick(){
this.searchPram.state=this.activeName === 'first'? 0 : this.activeName === 'second'? 1 : 2
this.getList()
},
changes(id,state){
......@@ -212,6 +213,10 @@
color: #FF3C3C;
}
}
.task_name{
word-wrap: break-word;
width: 87%;
}
}
}
.tabList{
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @ acf688ee
......@@ -149,31 +149,34 @@ public class EnterpriseService {
return new TableDataInfo(new ArrayList<>(), 0);
}
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
Integer code = MapUtils.getInteger(map, "code", 300);
if (!code.equals(HttpStatus.OK.value())) {
throw new RuntimeException();
}
Map data = MapUtils.getMap(map, "data", null);
List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
if (CollectionUtils.isEmpty(list)) {
return new TableDataInfo(list, 0);
}
List<Object> newList = new ArrayList<>(20);
for (Object companyObj : list) {
Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
String businessStatus = MapUtils.getString(companyMap, "businessStatus");
if (!"注销".equals(businessStatus)) {
newList.add(companyMap);
}
}
for (Object companyObj : list) {
Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
String businessStatus = MapUtils.getString(companyMap, "businessStatus");
if ("注销".equals(businessStatus)) {
newList.add(companyMap);
}
}
return new TableDataInfo(newList, MapUtils.getInteger(data, "totalCount", 0));
return dskOpenApiUtil.responsePage(map);
// Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
// Integer code = MapUtils.getInteger(map, "code", 300);
// if (!code.equals(HttpStatus.OK.value())) {
// throw new RuntimeException();
// }
// Map data = MapUtils.getMap(map, "data", null);
// List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
// if (CollectionUtils.isEmpty(list)) {
// return new TableDataInfo(list, 0);
// }
// List<Object> newList = new ArrayList<>(20);
// for (Object companyObj : list) {
// Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
// String businessStatus = MapUtils.getString(companyMap, "businessStatus");
// if (!"注销".equals(businessStatus)) {
// newList.add(companyMap);
// }
// }
// for (Object companyObj : list) {
// Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
// String businessStatus = MapUtils.getString(companyMap, "businessStatus");
// if ("注销".equals(businessStatus)) {
// newList.add(companyMap);
// }
// }
// return new TableDataInfo(newList, MapUtils.getInteger(data, "totalCount", 0));
}
public TableDataInfo affiliates(EnterpriseAffiliatesBody body) throws Exception {
......@@ -256,6 +259,18 @@ public class EnterpriseService {
//按照城投企业id合并两个list
for (Object companyObj : list) {
Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
companyMap.put("cid", MapUtils.getString(companyMap, "companyId"));
companyMap.put("bratingSubjectLevel", null);
Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", companyMap);
Integer codeRating = MapUtils.getInteger(bondCreditRatingMap, "code", 300);
if (codeRating.equals(HttpStatus.OK.value())) {
Object object = bondCreditRatingMap.get("data");
if (ObjectUtil.isNotEmpty(object)) {
ArrayList obj = (ArrayList)object;
Map<String, Object> bondCreditRating = (Map<String, Object>)obj.get(0);
companyMap.put("bratingSubjectLevel", bondCreditRating.get("bratingSubjectLevel"));
}
}
String uipId = MapUtils.getString(companyMap, "uipId");
companyMap.put("bondBalance",MapUtils.getDouble(companyMap, "bondBalance")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "bondBalance")));
companyMap.put("totalAssets",MapUtils.getDouble(companyMap, "totalAssets")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "totalAssets")));
......
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java
View file @ acf688ee
......@@ -43,10 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 项目详情Service业务层处理
......@@ -143,14 +140,36 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
@Override
public List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto) {
List<BusinessLikeProjectNameListVo> vos = businessInfoMapper.selectProjectName(dto);
if (!CollectionUtils.isEmpty(vos)) {
for (BusinessLikeProjectNameListVo vo : vos) {
vo.setProjectName(vo.getProjectName().replace(dto.getProjectName(), "<font color='#FF204E'>" + dto.getProjectName() + "</font>"));
}
}
// List<BusinessLikeProjectNameListVo> vos = new ArrayList<>();
// Map<String, Object> result = dskOpenApiUtil.requestBody("/company/bidding/newZhaoBiao/list", toRequestMap(dto));
// if ("200".equals(result.get("code")) && ObjectUtil.isNotEmpty(result.get("data"))
// && ObjectUtil.isNotEmpty(BeanUtil.beanToMap(result.get("data")).get("list"))) {
// List<Map<String, Object>> list = (List<Map<String, Object>>) BeanUtil.beanToMap(result.get("data")).get("list");
// if (!CollectionUtils.isEmpty(list)) {
// for (Map<String, Object> map : list) {
// BusinessLikeProjectNameListVo vo = new BusinessLikeProjectNameListVo();
// vo.setProjectName(MapUtil.getStr(map, "projectName").replace(dto.getProjectName(), "<font color='#FF204E'>" + dto.getProjectName() + "</font>"));
// vo.setInvestmentAmount(MapUtil.getDouble(map, "bidMoney"));
// vo.setProjectLevel(MapUtil.getStr(map, "bidMoney"));
// vo.setProjectStage(MapUtil.getStr(map, "tenderStage"));
// vo.setProjectType(MapUtil.getStr(map, "projectType"));
// vo.setProjectCategory(MapUtil.getStr(map, "projectType"));
// }
// }
// }
return vos;
}
private Map<String, Object> toRequestMap(BusinessListDto dto) {
Map<String, Object> page = new HashMap<>();
page.put("page", 1);
page.put("limit", 20);
Map<String, Object> map = new HashMap<>();
map.put("keyword", dto.getProjectName());
map.put("page", page);
return map;
}
@Override
public AjaxResult batchUpload(MultipartFile file) {
//获取当前登录用户id
......
dsk-system/src/main/java/com/dsk/system/service/impl/UrbanInvestmentPlatformServiceImpl.java
View file @ acf688ee
package com.dsk.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.dsk.acc.openapi.client.util.CommonUtils;
import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.dtos.UrbanInvestmentPlatformDto;
......@@ -58,6 +59,18 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
//按照城投企业id合并两个list
for (Object companyObj : list) {
Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
companyMap.put("bratingSubjectLevel", null);
companyMap.put("cid", MapUtils.getString(companyMap, "companyId"));
Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", companyMap);
Integer codeRating = MapUtils.getInteger(bondCreditRatingMap, "code", 300);
if (codeRating.equals(HttpStatus.OK.value())) {
Object object = bondCreditRatingMap.get("data");
if (ObjectUtil.isNotEmpty(object)) {
ArrayList obj = (ArrayList)object;
Map<String, Object> bondCreditRating = (Map<String, Object>)obj.get(0);
companyMap.put("bratingSubjectLevel", bondCreditRating.get("bratingSubjectLevel"));
}
}
String uipId = MapUtils.getString(companyMap, "uipId");
companyMap.put("claimStatus", 0);
for (CustomerStatusListVo vo : customerStatusListVos) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment