Skip to content

D
dsk-cr20g
Commit 963df5ab 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 d2d652e7 bf92e4a9
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 70 deletions
dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java
View file @ 963df5ab
......@@ -196,8 +196,7 @@ public class CustomerController extends BaseController {
/**
* 客户状态
*/
@GetMapping("/status/{customerId}")
@RepeatSubmit
@GetMapping("/status/{companyName}")
public AjaxResult status(@PathVariable String companyName) {
return AjaxResult.success(baseService.status(companyName));
}
......@@ -206,18 +205,18 @@ public class CustomerController extends BaseController {
/**
* 取消认领
*/
@PutMapping("/cancelClaim/{customerId}")
@PutMapping("/cancelClaim/{companyName}")
@RepeatSubmit
public AjaxResult cancelClaim(@PathVariable String customerId) {
return toAjax(baseService.cancelClaim(customerId));
public AjaxResult cancelClaim(@PathVariable String companyName) {
return toAjax(baseService.cancelClaim(companyName));
}
/**
* 历史认领
*/
@PutMapping("/historyClaim/{customerId}")
@PutMapping("/historyClaim/{companyName}")
@RepeatSubmit
public AjaxResult historyClaim(@PathVariable String customerId) {
return toAjax(baseService.historyClaim(customerId));
public AjaxResult historyClaim(@PathVariable String companyName) {
return toAjax(baseService.historyClaim(companyName));
}
}
dsk-operate-ui/src/api/macro/macro.js
View file @ 963df5ab
......@@ -215,6 +215,14 @@ export function claim(param) {
data: param
})
}
//批量获取城投企业id
export function getUipIdByCid(param) {
return request({
url: '/enterprise/getUipIdByCid',
method: 'POST',
data: param
})
}
......
dsk-operate-ui/src/views/macro/economies/component/comparison.vue
View file @ 963df5ab
......@@ -16,9 +16,9 @@
<span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div>
</div>
<div class="table-item" ref="regionalStyle">
<!--<div class="table-title" :class="fixed == true ? 'fixed' : ''" :style="'width:' + StyWidth">-->
<div class="table-title">
<div class="table-item" ref="regionalStyle" id="regionalStyle">
<div class="table-title" :class="fixed == true ? 'fixed' : ''" :style="'width:' + StyWidth">
<!--<div class="table-title">-->
<span class="span-tit">指标</span>
<span class="span-tit">
<span class="address" v-if="value1Flag">{{addressValue1}}<i class="el-icon-circle-close" @click="handleDelete(1)"></i></span>
......@@ -103,6 +103,7 @@
<script>
import dataRegion from '@/assets/json/dataRegion'
import elementResizeDetectorMaker from "element-resize-detector"
import { regionalCompare,getYears,multipleCompare } from '@/api/macro/macro'
export default {
name: 'comparison',
......@@ -300,10 +301,16 @@ export default {
}
},
mounted(){
// window.addEventListener('scroll', this.handleScroll);
window.addEventListener('scroll', this.handleScroll);
const _this = this, erd = elementResizeDetectorMaker(), partBox = document.getElementById("regionalStyle")
erd.listenTo(partBox, element => {
_this.$nextTick(() => {
this.StyWidth = partBox.offsetWidth + 'px';
})
})
},
destroyed () {
// window.removeEventListener('scroll', this.handleScroll)
window.removeEventListener('scroll', this.handleScroll)
},
created() {
this.dataRegion();
......@@ -340,10 +347,6 @@ export default {
this.getData(params)
}
})
this.$nextTick(function () {
this.StyWidth = this.$refs.regionalStyle.offsetWidth + 'px';
})
},
computed: {
getHeaders() {
......
dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue
View file @ 963df5ab
......@@ -25,7 +25,7 @@
@sort-change="sortChange"
:default-sort = "{prop: 'gdp', order: 'descending'}"
>
<el-table-column prop="province" label="下辖区" width="170" :formatter="formatStatus" fixed>
<el-table-column prop="province" label="下辖区" width="100" :formatter="formatStatus" fixed>
<!--<template slot-scope="scope">-->
<!--{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}-->
<!--</template>-->
......
dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue
View file @ 963df5ab
......@@ -64,10 +64,10 @@
<div class="content content2">
<div class="common-title">经济信息</div>
<div class="content-box">
<span><img src="@/assets/images/economies/icon_1.png">下属辖区 <label>{{recentlyYear.subordinateJurisdiction}}<i>个</i></label></span>
<span><img src="@/assets/images/economies/icon_2.png">城投平台 <label>{{recentlyYear.urbanInvestmentPlatform}}<i>家</i></label></span>
<span @click="childMethod(1)" style="cursor: pointer;"><img src="@/assets/images/economies/icon_1.png">下属辖区 <label>{{recentlyYear.subordinateJurisdiction}}<i>个</i></label></span>
<span @click="childMethod(2)" style="cursor: pointer;"><img src="@/assets/images/economies/icon_2.png">城投平台 <label>{{recentlyYear.urbanInvestmentPlatform}}<i>家</i></label></span>
<span><img src="@/assets/images/economies/icon_3.png">城投平台授信余额 <label>{{recentlyYear.creditBalance}}<i>亿</i></label></span>
<span><img src="@/assets/images/economies/icon_4.png">城投平台营收账款 <label>{{recentlyYear.accountsReceivable}}<i>亿</i></label></span>
<span><img src="@/assets/images/economies/icon_4.png">城投平台应收账款 <label>{{recentlyYear.accountsReceivable}}<i>亿</i></label></span>
<span><img src="@/assets/images/economies/icon_5.png">城投平台有息债务 <label>{{recentlyYear.uipInterestBearingDebt}}<i>亿</i></label></span>
</div>
</div>
......@@ -77,7 +77,7 @@
<span class="common-title">主要指标</span>
</div>
<div class="flex-box query-ability">
<span class="flex-box" @click="childMethod"><img src="@/assets/images/ability_vs.png">地区经济对比</span>
<span class="flex-box" @click="childMethod(4)"><img src="@/assets/images/ability_vs.png">地区经济对比</span>
<span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div>
</div>
......@@ -674,12 +674,27 @@ export default {
type: 'warning'
});
},
childMethod() {
childMethod(key) {
let data=this.dataQuery
console.log(this.dataQuery,"||||||||")
data.pId=this.dataQuery.provinceId
this.$parent.handleClick('four',data);
}
switch (key) {
case 1:
this.$parent.handleClick('second', data);
break;
case 2:
this.$router.push({
path: '/macro/urban',
query:{
provinceId:this.dataQuery.provinceId
}
})
break;
case 4:
this.$parent.handleClick('four', data);
break;
}
},
}
}
</script>
......
dsk-operate-ui/src/views/macro/economies/index.vue
View file @ 963df5ab
......@@ -95,11 +95,15 @@ export default {
},
methods: {
handleClick(key,item) {
console.log(key)
if(key === 'four'){
this.activeName='four'
this.activeName=key
}
if(key === 'first'){
this.activeName='first'
this.activeName=key
}
if(key === 'second'){
this.activeName=key
}
if(item.cityId){
if(this.provinceId.length >= 2){
......
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @ 963df5ab
......@@ -38,7 +38,7 @@
<el-table-column label="序号" width="60" align="left" fixed>
<template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
</el-table-column>
<el-table-column label="公司名称" align="left" fixed width="350">
<el-table-column label="公司名称" align="left" fixed width="290">
<template slot-scope="scope">
<router-link v-if="scope.row.jskEid" :to="`/company/${encodeStr(scope.row.jskEid)}`" tag="a" class="a-link" v-html="scope.row.name" ></router-link>
<span v-else v-html="scope.row.name" ></span>
......@@ -53,18 +53,18 @@
<el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="120" :formatter="formatStatus"/>
<el-table-column label="公路业绩" prop="roadConservancy" sortable="custom" width="100" :formatter="formatStatus"/>
<el-table-column label="水利业绩" prop="waterConservancy" sortable="custom" width="100" :formatter="formatStatus"/>
<el-table-column label="常合作业主" prop="topCustomer" width="150" :formatter="formatStatus">
<el-table-column label="常合作业主" prop="topCustomer" width="290" :formatter="formatStatus">
<template slot-scope="scope">
<router-link v-if="scope.row.topCustomerId" :to="`/company/${encodeStr(scope.row.topCustomerId)}`" tag="a" class="a-link" v-html="scope.row.topCustomer" ></router-link>
<span v-else v-html="scope.row.topCustomer" ></span>
<span style="cursor: pointer;" v-if="scope.row.topCustomerId" @click="getUipIdByCid(scope.row.topCustomerId)" class="a-link" v-html="scope.row.topCustomer" ></span>
<span v-else>{{scope.row.topCustomer ? scope.row.topCustomer :'-'}}</span>
</template>
</el-table-column>
<el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="120" :formatter="formatStatus"/>
<el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="150" :formatter="formatStatus"/>
<el-table-column label="常合作供应商" prop="topSupplier" width="200" :formatter="formatStatus">
<el-table-column label="常合作供应商" prop="topSupplier" width="290" :formatter="formatStatus">
<template slot-scope="scope">
<router-link v-if="scope.row.topSupplierId" :to="`/company/${encodeStr(scope.row.topSupplierId)}`" tag="a" class="a-link" v-html="scope.row.topSupplier" ></router-link>
<span v-else v-html="scope.row.topSupplier" ></span>
<span v-else>{{scope.row.topSupplier ? scope.row.topSupplier :'-'}}</span>
</template>
</el-table-column>
</el-table>
......@@ -89,7 +89,7 @@
// import Offsite from './component/offsite'
import {encodeStr} from "@/assets/js/common.js"
import aptitudeCode from '@/assets/json/aptitudeCode'
import { enterprise,location } from '@/api/macro/macro'
import { enterprise,location,getUipIdByCid } from '@/api/macro/macro'
export default {
name: 'Enterprises',
// components: {LocalEnterprises,Offsite},
......@@ -132,7 +132,7 @@ export default {
},
methods: {
//资质Json
//资质Json
async aptitudeCode() {
// await axios.post("https://files.jiansheku.com/file/json/common/aptitudeCode.json", {}, {
// headers: {
......@@ -245,6 +245,21 @@ export default {
this.pageIndex = 1;
this.querySubmit()
},
getUipIdByCid(companyId){
var params=[companyId]
getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
}).catch(error=>{
});
},
}
}
</script>
......@@ -315,11 +330,12 @@ export default {
}
}
}
::v-deep .el-input{
::v-deep .el-input.el-input-group{
width: 250px;
height: 32px;
.el-input__inner{
height: 32px;
border-right: 0;
}
.el-input-group__append{
width: 59px;
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ 963df5ab
......@@ -139,6 +139,7 @@
<span class="common-title">城投平台列表</span>
</div>
<div class="flex-box query-ability">
<span class="total">共{{tableDataTotal}}条</span>
<span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div>
</div>
......
dsk-system/src/main/java/com/dsk/system/domain/customer/vo/CustomerFollowRecordListVo.java
View file @ 963df5ab
......@@ -40,9 +40,15 @@ public class CustomerFollowRecordListVo implements Serializable {
* 拜访方式（visit_mode_type）
*/
private String visitMode;
/**
* 拜访时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date visitTime;
/**
* 下次拜访时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date nextVisitTime;
/**
* 拜访对象姓名
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @ 963df5ab
......@@ -12,6 +12,7 @@ import com.dsk.common.core.page.TableDataInfo;
import com.dsk.common.core.redis.RedisCache;
import com.dsk.common.utils.DskOpenApiUtil;
import com.dsk.common.utils.EncodeIdUtil;
import com.dsk.common.utils.StringUtils;
import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
import com.dsk.system.service.ICustomerService;
import org.apache.commons.collections4.CollectionUtils;
......@@ -224,6 +225,42 @@ public class EnterpriseService {
for (Object companyObj : list) {
Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
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")));
companyMap.put("belongNetAssets",MapUtils.getDouble(companyMap, "belongNetAssets")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "belongNetAssets")));
companyMap.put("monetaryFunds",MapUtils.getDouble(companyMap, "monetaryFunds")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "monetaryFunds")));
companyMap.put("landAssets",MapUtils.getDouble(companyMap, "landAssets")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "landAssets")));
companyMap.put("restrictedAssets",MapUtils.getDouble(companyMap, "restrictedAssets")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "restrictedAssets")));
companyMap.put("accountsReceivable",MapUtils.getDouble(companyMap, "accountsReceivable")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "accountsReceivable")));
companyMap.put("otherReceivable",MapUtils.getDouble(companyMap, "otherReceivable")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "otherReceivable")));
companyMap.put("econData_001",MapUtils.getDouble(companyMap, "econData_001")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "econData_001")));
companyMap.put("govSubsidy",MapUtils.getDouble(companyMap, "govSubsidy")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "govSubsidy")));
companyMap.put("specialPayable",MapUtils.getDouble(companyMap, "specialPayable")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "specialPayable")));
companyMap.put("operatingIncome",MapUtils.getDouble(companyMap, "operatingIncome")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "operatingIncome")));
companyMap.put("belongNetProfit",MapUtils.getDouble(companyMap, "belongNetProfit")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "belongNetProfit")));
companyMap.put("roe",MapUtils.getDouble(companyMap, "roe")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "roe")));
companyMap.put("netOperatingCashFlow",MapUtils.getDouble(companyMap, "netOperatingCashFlow")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "netOperatingCashFlow")));
companyMap.put("netFinancingCashFlow",MapUtils.getDouble(companyMap, "netFinancingCashFlow")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "netFinancingCashFlow")));
companyMap.put("netInvestmentCashFlow",MapUtils.getDouble(companyMap, "netInvestmentCashFlow")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "netInvestmentCashFlow")));
companyMap.put("totalLiabilities",MapUtils.getDouble(companyMap, "totalLiabilities")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "totalLiabilities")));
companyMap.put("uipInterestBearingDebt",MapUtils.getDouble(companyMap, "uipInterestBearingDebt")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "uipInterestBearingDebt")));
companyMap.put("econData_002",MapUtils.getDouble(companyMap, "econData_002")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "econData_002")));
companyMap.put("ofcb",MapUtils.getDouble(companyMap, "ofcb")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "ofcb")));
companyMap.put("cashRatio",MapUtils.getDouble(companyMap, "cashRatio")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "cashRatio")));
companyMap.put("cashFlowRatio",MapUtils.getDouble(companyMap, "cashFlowRatio")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "cashFlowRatio")));
companyMap.put("cashDebtRatio",MapUtils.getDouble(companyMap, "cashDebtRatio")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "cashDebtRatio")));
companyMap.put("creditBalance",MapUtils.getDouble(companyMap, "creditBalance")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "creditBalance")));
companyMap.put("econData_003",MapUtils.getDouble(companyMap, "econData_003")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "econData_003")));
companyMap.put("ebitdaIcr",MapUtils.getDouble(companyMap, "ebitdaIcr")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "ebitdaIcr")));
companyMap.put("ppnBalanceProp",MapUtils.getDouble(companyMap, "ppnBalanceProp")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "ppnBalanceProp")));
companyMap.put("econData_004",MapUtils.getDouble(companyMap, "econData_004")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "econData_004")));
companyMap.put("econData_005",MapUtils.getDouble(companyMap, "econData_005")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "econData_005")));
companyMap.put("econData_006",MapUtils.getDouble(companyMap, "econData_006")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "econData_006")));
companyMap.put("nonStandardBalance",MapUtils.getDouble(companyMap, "nonStandardBalance")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "nonStandardBalance")));
companyMap.put("nonStandardRatio",MapUtils.getDouble(companyMap, "nonStandardRatio")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "nonStandardRatio")));
companyMap.put("guaranteeAmount",MapUtils.getDouble(companyMap, "guaranteeAmount")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "guaranteeAmount")));
companyMap.put("guaranteeRatio",MapUtils.getDouble(companyMap, "guaranteeRatio")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "guaranteeRatio")));
companyMap.put("claimStatus", 0);
for (CustomerStatusListVo vo : claimStatusList) {
if (uipId.equals(vo.getUipId())) {
......@@ -235,6 +272,14 @@ public class EnterpriseService {
return new TableDataInfo(list, MapUtils.getInteger(data, "totalCount", 0));
}
public static void main(String[] args) {
String str = String.format("%1$.2f", 0.0456);
System.out.println(str);
String format = String.format("%.2f", null);
System.out.println(format);
}
public R uipGroupData() throws Exception {
String redisKey = CacheConstants.DATA_UIPGROUPDATA;
......
dsk-system/src/main/java/com/dsk/system/mapper/CustomerMapper.java
View file @ 963df5ab
......@@ -28,7 +28,7 @@ public interface CustomerMapper extends BaseMapper<Customer> {
List<CustomerStatusListVo> selectStatusList(@Param("uipIds") List<String> uipIds, @Param("userId") Long userId);
List<String> selectUipIdList(@Param("uipIds") List<String> uipIds, @Param("userId") Long userId);
// List<String> selectUipIdList(@Param("uipIds") List<String> uipIds, @Param("userId") Long userId);
}
dsk-system/src/main/java/com/dsk/system/service/ICustomerService.java
View file @ 963df5ab
......@@ -29,12 +29,12 @@ public interface ICustomerService {
List<CustomerStatusListVo> selectStatusList(List<String> uipIds);
List<String> selectUipIdList(List<String> uipIds);
// List<String> selectUipIdList(List<String> uipIds);
Integer status(String companyName);
boolean cancelClaim(String customerId);
boolean cancelClaim(String companyName);
boolean historyClaim(String customerId);
boolean historyClaim(String companyName);
}
dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java
View file @ 963df5ab
......@@ -120,10 +120,10 @@ public class CustomerServiceImpl implements ICustomerService {
}
@Override
public List<String> selectUipIdList(List<String> uipIds) {
return baseMapper.selectUipIdList(uipIds, SecurityUtils.getUserId());
}
// @Override
// public List<String> selectUipIdList(List<String> uipIds) {
// return baseMapper.selectUipIdList(uipIds, SecurityUtils.getUserId());
// }
@Override
public Integer status(String companyName) {
......@@ -139,18 +139,22 @@ public class CustomerServiceImpl implements ICustomerService {
}
@Override
public boolean cancelClaim(String customerId) {
return updateClaimStatus(customerId, 1);
public boolean cancelClaim(String companyName) {
return updateClaimStatus(companyName, 1);
}
@Override
public boolean historyClaim(String customerId) {
return updateClaimStatus(customerId, 0);
public boolean historyClaim(String companyName) {
return updateClaimStatus(companyName, 0);
}
//修改客户认领状态
private boolean updateClaimStatus(String customerId, Integer status) {
CustomerUser customerUser = customerUserMapper.selectByCustomerIdAndUserId(customerId, SecurityUtils.getUserId());
private boolean updateClaimStatus(String companyName, Integer status) {
Customer cus = baseMapper.selectByCompanyNameAndUserId(companyName, SecurityUtils.getUserId());
if (ObjectUtils.isEmpty(cus)) {
throw new ServiceException("数据错误！");
}
CustomerUser customerUser = customerUserMapper.selectByCustomerIdAndUserId(cus.getCustomerId(), SecurityUtils.getUserId());
if (ObjectUtils.isEmpty(customerUser)) {
throw new ServiceException("数据错误！");
}
......
dsk-system/src/main/java/com/dsk/system/service/impl/UrbanInvestmentPlatformServiceImpl.java
View file @ 963df5ab
......@@ -5,6 +5,7 @@ import com.dsk.acc.openapi.client.util.CommonUtils;
import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.dtos.UrbanInvestmentPlatformDto;
import com.dsk.common.utils.DskOpenApiUtil;
import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
import com.dsk.system.service.ICustomerService;
import com.dsk.system.service.UrbanInvestmentPlatformService;
import org.apache.commons.collections4.CollectionUtils;
......@@ -51,19 +52,32 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
for (Object dataMap : list) {
uipIds.add(MapUtils.getString(CommonUtils.assertAsMap(dataMap), "uipId"));
}
List<String> claimStatusList = iCustomerService.selectUipIdList(uipIds);
// List<String> claimStatusList = iCustomerService.selectUipIdList(uipIds);
List<CustomerStatusListVo> customerStatusListVos = iCustomerService.selectStatusList(uipIds);
//按照城投企业id合并两个list
//按照城投企业id合并两个list
for (Object companyObj : list) {
Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
String uipId = MapUtils.getString(companyMap, "uipId","uipId");
if (CollectionUtils.isEmpty(claimStatusList)) {
companyMap.put("claimStatus", 0);
} else if (claimStatusList.contains(uipId)) {
companyMap.put("claimStatus", 1);
} else {
companyMap.put("claimStatus", 0);
String uipId = MapUtils.getString(companyMap, "uipId");
companyMap.put("claimStatus", 0);
for (CustomerStatusListVo vo : customerStatusListVos) {
if (uipId.equals(vo.getUipId())) {
companyMap.put("claimStatus", 1);
}
}
}
// for (Object companyObj : list) {
// Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
// String uipId = MapUtils.getString(companyMap, "uipId","uipId");
// if (CollectionUtils.isEmpty(claimStatusList)) {
// companyMap.put("claimStatus", 0);
// } else if (claimStatusList.contains(uipId)) {
// companyMap.put("claimStatus", 1);
// } else {
// companyMap.put("claimStatus", 0);
// }
// }
return BeanUtil.toBean(map, AjaxResult.class);
}
......
dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml
View file @ 963df5ab
......@@ -52,22 +52,22 @@
ct.customer_id, ct.uip_id
from customer ct
join customer_user ctu on ct.customer_id = ctu.customer_id
where ctu.user_id = #{userId} and ct.uip_id in
where ctu.user_id = #{userId} and ctu.status = 0 and ct.uip_id in
<foreach collection="uipIds" item="uipId" open="(" separator="," close=")">
#{uipId}
</foreach>
</select>
<select id="selectUipIdList" resultType="java.lang.String">
select
ct.uip_id
from customer ct
join customer_user ctu on ct.customer_id = ctu.customer_id
where ctu.user_id = #{userId} and ct.uip_id in
<foreach collection="uipIds" item="uipId" open="(" separator="," close=")">
#{uipId}
</foreach>
</select>
<!-- <select id="selectUipIdList" resultType="java.lang.String">-->
<!-- select-->
<!-- ct.uip_id-->
<!-- from customer ct-->
<!-- join customer_user ctu on ct.customer_id = ctu.customer_id-->
<!-- where ctu.user_id = #{userId} and ctu.status = 0 and ct.uip_id in-->
<!-- <foreach collection="uipIds" item="uipId" open="(" separator="," close=")">-->
<!-- #{uipId}-->
<!-- </foreach>-->
<!-- </select>-->
</mapper>
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