Skip to content

D
dsk-cr20g
Commit 563d64b9 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 f30fcd45 a9c26765
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1354 additions and 293 deletions
dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessBacklogController.java
View file @ 563d64b9
......@@ -4,6 +4,7 @@ import com.dsk.common.core.controller.BaseController;
import com.dsk.common.core.domain.AjaxResult;
import com.dsk.system.domain.business.BusinessBacklog;
import com.dsk.common.core.page.TableDataInfo;
import com.dsk.system.domain.business.dto.BusinessBacklogListDto;
import com.dsk.system.service.IBusinessBacklogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -31,10 +32,10 @@ public class BusinessBacklogController extends BaseController
*/
// @PreAuthorize("@ss.hasPermi('system:backlog:list')")
@GetMapping("/list")
public TableDataInfo list(BusinessBacklog businessBacklog)
public TableDataInfo list(BusinessBacklogListDto dto)
{
startPage();
return getDataTable(businessBacklogService.selectBusinessBacklogList(businessBacklog));
return getDataTable(businessBacklogService.selectBusinessBacklogList(dto));
}
/**
......
dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessInfoController.java
View file @ 563d64b9
......@@ -52,8 +52,7 @@ public class BusinessInfoController extends BaseController
public TableDataInfo list(BusinessListDto dto)
{
startPage();
List<BusinessListVo> list = businessInfoService.selectBusinessInfoList(dto);
return getDataTable(list);
return getDataTable(businessInfoService.selectBusinessInfoList(dto));
}
/**
......
dsk-common/src/main/java/com/dsk/common/core/domain/entity/SysUser.java
View file @ 563d64b9
......@@ -69,6 +69,9 @@ public class SysUser extends BaseEntity
@Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Excel.Type.EXPORT)
private Date loginDate;
//是否体验用户 0否 1是
private Integer isExperience;
/** 部门对象 */
@Excels({
@Excel(name = "部门名称", targetAttr = "deptName", type = Excel.Type.EXPORT),
......@@ -296,6 +299,14 @@ public class SysUser extends BaseEntity
this.roleId = roleId;
}
public Integer getIsExperience() {
return isExperience;
}
public void setIsExperience(Integer isExperience) {
this.isExperience = isExperience;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......@@ -312,6 +323,7 @@ public class SysUser extends BaseEntity
.append("delFlag", getDelFlag())
.append("loginIp", getLoginIp())
.append("loginDate", getLoginDate())
.append("isExperience", getIsExperience())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
......
dsk-common/src/main/java/com/dsk/common/dtos/UrbanInvestmentPlatformSubjectLevelDto.java 0 → 100644
View file @ 563d64b9
package com.dsk.common.dtos;
import lombok.Data;
import java.util.Objects;
/**
* @ClassName UrbanInvestmentPlatformSubjectLevelDto
* @Description 信用评级
* @Author Dgm
* @Date 2023/5/23 14:05
* @Version
*/
@Data
public class UrbanInvestmentPlatformSubjectLevelDto {
/**
* 企业Id
*/
private Long companyId;
/**
* 主体评级
*/
private String bratingSubjectLevel;
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
UrbanInvestmentPlatformSubjectLevelDto that = (UrbanInvestmentPlatformSubjectLevelDto) o;
return Objects.equals(companyId, that.companyId);
}
@Override
public int hashCode() {
return Objects.hash(companyId);
}
}
dsk-operate-ui/src/views/custom/historicalCustomers/index.vue
View file @ 563d64b9
......@@ -38,7 +38,7 @@
width="316">
<template slot-scope="scope">
<div class="ps1">
<div class="wordprimary ps2" @click="toDetail(scope.row,'')">{{scope.row.companyName}}</div>
<div class="wordprimary ps2" @click="toDetail(scope.row,'')" v-html="scope.row.companyName"></div>
<div class="ps3">
<el-tooltip class="item" effect="dark" content="重新认领" placement="top">
<div @click="toRL(scope.row)"><img class="i" src="@/assets/images/project/khrl1.png"><img class="o" src="@/assets/images/project/khrl2.png"></div>
......
dsk-operate-ui/src/views/detail/party-a/component/skeleton.vue 0 → 100644
View file @ 563d64b9
<template>
<el-skeleton animated>
<template slot="template">
<el-skeleton-item variant="text" style="width: 60%;"/>
<el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 60%;" />
<el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 100%;" />
</template>
</el-skeleton>
</template>
<script>
export default {
name: 'skeleton'
}
</script>
<style lang="scss" scoped>
.el-skeleton__item{
height: 20px;
border-radius: 0;
margin: 9px 0;
background: #f0f0f0;
}
</style>
dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue
View file @ 563d64b9
......@@ -8,9 +8,9 @@
:isExcel="true"
@handle-search="handleSearch"
/>
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<tables
:tableLoading="tableLoading"
v-if="!isSkeleton"
:tableData="tableData"
:forData="forData"
:tableDataTotal="tableDataTotal"
......@@ -27,11 +27,12 @@ import {
abnormalYears
} from '@/api/detail/party-a/riskInformation'
import mixin from '../mixins/mixin'
import skeleton from '../component/skeleton'
export default {
name: 'BusinessAnomaly',
mixins: [mixin],
components: {
skeleton
},
props: ['companyId'],
data() {
......@@ -56,6 +57,7 @@ export default {
tableLoading:false,
tableData:[],
tableDataTotal:0,
isSkeleton:true
}
},
created() {
......@@ -68,11 +70,11 @@ export default {
methods: {
handleQuery(params) {
let data = params ? params : this.queryParams
this.tableLoading = true
this.isSkeleton = true
abnormalPage(data).then(res => {
this.tableData = res.rows
this.tableDataTotal = res.total
this.tableLoading = false
this.isSkeleton = false
})
},
years(){
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/courtNotice.vue
View file @ 563d64b9
......@@ -8,9 +8,9 @@
:isExcel="true"
@handle-search="handleSearch"
/>
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<tables
:tableLoading="tableLoading"
v-if="!isSkeleton"
:tableData="tableData"
:forData="forData"
:tableDataTotal="tableDataTotal"
......@@ -29,11 +29,12 @@ import {
noticesCaseReason
} from '@/api/detail/party-a/riskInformation'
import mixin from '../mixins/mixin'
import skeleton from '../component/skeleton'
export default {
name: 'CourtNotice',
mixins: [mixin],
components: {
skeleton
},
props: ['companyId'],
data() {
......@@ -60,6 +61,7 @@ export default {
tableLoading:false,
tableData:[],
tableDataTotal:0,
isSkeleton:true
}
},
created() {
......@@ -74,11 +76,11 @@ export default {
methods: {
handleQuery(params) {
let data = params ? params : this.queryParams
this.tableLoading = true
this.isSkeleton = true
noticesPage(data).then(res => {
this.tableData = res.rows
this.tableDataTotal = res.total
this.tableLoading = false
this.isSkeleton = false
})
},
// 公告
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/dishonesty.vue
View file @ 563d64b9
......@@ -8,10 +8,10 @@
:isExcel="false"
@handle-search="handleSearch"
/>
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<tables
v-if="!isSkeleton"
:index-fixed="true"
:tableLoading="tableLoading"
:tableData="tableData"
:forData="forData"
:tableDataTotal="tableDataTotal"
......@@ -27,11 +27,12 @@ import {
executedPage
} from '@/api/detail/party-a/riskInformation'
import mixin from '../mixins/mixin'
import skeleton from '../component/skeleton'
export default {
name: 'Dishonesty',
mixins: [mixin],
components: {
skeleton
},
props: ['companyId'],
data() {
......@@ -56,6 +57,7 @@ export default {
tableLoading:false,
tableData:[],
tableDataTotal:0,
isSkeleton:true
}
},
created() {
......@@ -67,11 +69,11 @@ export default {
methods: {
handleQuery(params) {
let data = params ? params : this.queryParams
this.tableLoading = true
this.isSkeleton = true
executedPage(data).then(res => {
this.tableData = res.rows
this.tableDataTotal = res.total
this.tableLoading = false
this.isSkeleton = false
})
}
}
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/ifThePerson.vue
View file @ 563d64b9
......@@ -8,9 +8,9 @@
:isExcel="false"
@handle-search="handleSearch"
/>
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<tables
:tableLoading="tableLoading"
v-if="!isSkeleton"
:tableData="tableData"
:forData="forData"
:tableDataTotal="tableDataTotal"
......@@ -26,11 +26,12 @@ import {
executedPersonsPage
} from '@/api/detail/party-a/riskInformation'
import mixin from '../mixins/mixin'
import skeleton from '../component/skeleton'
export default {
name: 'IfThePerson',
mixins: [mixin],
components: {
skeleton
},
props: ['companyId'],
data() {
......@@ -53,6 +54,7 @@ export default {
tableLoading:false,
tableData:[],
tableDataTotal:0,
isSkeleton:true
}
},
created() {
......@@ -64,11 +66,11 @@ export default {
methods: {
handleQuery(params) {
let data = params ? params : this.queryParams
this.tableLoading = true
this.isSkeleton = true
executedPersonsPage(data).then(res => {
this.tableData = res.rows
this.tableDataTotal = res.total
this.tableLoading = false
this.isSkeleton = false
})
}
}
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/judgment.vue
View file @ 563d64b9
......@@ -8,9 +8,9 @@
:isExcel="false"
@handle-search="handleSearch"
/>
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<tables
:tableLoading="tableLoading"
v-if="!isSkeleton"
:tableData="tableData"
:forData="forData"
:tableDataTotal="tableDataTotal"
......@@ -35,11 +35,12 @@ import {
lawsuitsRole
} from '@/api/detail/party-a/riskInformation'
import mixin from '../mixins/mixin'
import skeleton from '../component/skeleton'
export default {
name: 'Judgment',
mixins: [mixin],
components: {
skeleton
},
props: ['companyId'],
data() {
......@@ -68,6 +69,7 @@ export default {
tableLoading:false,
tableData:[],
tableDataTotal:0,
isSkeleton:true
}
},
created() {
......@@ -81,14 +83,14 @@ export default {
methods: {
handleQuery(params) {
let data = params ? params : this.queryParams
this.tableLoading = true
this.isSkeleton = true
lawsuitsPage(data).then(res => {
this.tableData = res.rows
for (var i=0;i<this.tableData.length;i++){
this.tableData[i].relatedCompanies = JSON.parse(this.tableData[i].relatedCompanies)
}
this.tableDataTotal = res.total
this.tableLoading = false
this.isSkeleton = false
})
},
lawsuitsCauseActions(){
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/openacourtsessionNotice.vue
View file @ 563d64b9
......@@ -8,10 +8,10 @@
:isExcel="false"
@handle-search="handleSearch"
/>
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<tables
:index-fixed="true"
:tableLoading="tableLoading"
v-if="!isSkeleton"
:tableData="tableData"
:forData="forData"
:tableDataTotal="tableDataTotal"
......@@ -35,11 +35,12 @@ import {
kaitingPureRole
} from '@/api/detail/party-a/riskInformation'
import mixin from '../mixins/mixin'
import skeleton from '../component/skeleton'
export default {
name: 'OpenacourtsessionNotice',
mixins: [mixin],
components: {
skeleton
},
props: ['companyId'],
data() {
......@@ -71,6 +72,7 @@ export default {
tableLoading:false,
tableData:[],
tableDataTotal:0,
isSkeleton:true
}
},
created() {
......@@ -88,14 +90,14 @@ export default {
},
handleQuery(params) {
let data = params ? params : this.queryParams
this.tableLoading = true
this.isSkeleton = true
kaitingPage(data).then(res => {
this.tableData = res.rows
for (var i=0;i<this.tableData.length;i++){
this.tableData[i].relatedCompanies = JSON.parse(this.tableData[i].relatedCompanies)
}
this.tableDataTotal = res.total
this.tableLoading = false
this.isSkeleton = false
})
},
kaitingCauseActions(){
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue
View file @ 563d64b9
......@@ -8,10 +8,10 @@
:isExcel="true"
@handle-search="handleSearch"
/>
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<tables
v-if="!isSkeleton"
:indexFixed="true"
:tableLoading="tableLoading"
:tableData="tableData"
:forData="forData"
:tableDataTotal="tableDataTotal"
......@@ -35,11 +35,12 @@ import {
penalizePage,
penalizeReasonType
} from '@/api/detail/party-a/riskInformation'
import skeleton from '../component/skeleton'
export default {
name: 'Punish',
mixins: [mixin],
components: {
skeleton
},
props: ['companyId'],
data() {
......@@ -66,6 +67,7 @@ export default {
tableData:[],
tableDataTotal:0,
showList:[],
isSkeleton:true
}
},
created() {
......@@ -78,11 +80,11 @@ export default {
methods: {
handleQuery(params) {
let data = params ? params : this.queryParams
this.tableLoading = true
this.isSkeleton = true
penalizePage(data).then((res) => {
this.tableData = res.rows
this.tableDataTotal = res.total
this.tableLoading = false
this.isSkeleton = false
})
},
penalizeReasonTypeData(){
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/landAcquisition.vue
View file @ 563d64b9
......@@ -8,8 +8,9 @@
:isExcel="true"
@handle-search="handleSearch"
/>
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<tables
v-if="!isSkeleton"
:tableLoading="tableLoading"
:tableData="tableData"
:forData="forData"
......@@ -32,11 +33,12 @@ import {
landUse
} from '@/api/detail/party-a/urbanLnvestment'
import mixin from '../mixins/mixin'
import skeleton from '../component/skeleton'
export default {
name: 'landAcquisition',
mixins: [mixin],
components: {
skeleton
},
props: ['companyId'],
data() {
......@@ -66,6 +68,7 @@ export default {
tableLoading:false,
tableData:[],
tableDataTotal:0,
isSkeleton:true
}
},
created() {
......@@ -78,11 +81,11 @@ export default {
methods: {
handleQuery(params) {
let data = params ? params : this.queryParams
this.tableLoading = true
this.isSkeleton = true
landTransactionPage(data).then(res=>{
this.tableData = res.rows
this.tableDataTotal = res.total
this.tableLoading = false
this.isSkeleton = false
})
},
//土地用途
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue
View file @ 563d64b9
......@@ -6,7 +6,8 @@
</div>
<div class="params-dw"><img src="@/assets/images/addree.png" />{{ addressList }}</div>
</div>
<div class="table-item">
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div class="table-item" v-if="!isSkeleton">
<el-table
:tableLoading="tableLoading"
:data="getValues"
......@@ -29,13 +30,14 @@
<script>
import dataRegion from '@/assets/json/dataRegion'
import skeleton from '../component/skeleton'
import {
regionalEconomy
} from '@/api/detail/party-a/urbanLnvestment'
export default {
name: 'regionalEconomies',
components: {
skeleton
},
props: ['companyId','companyInfo'],
data() {
......@@ -209,7 +211,8 @@ export default {
label: '债务率-宽口径（%）',
},
],
tableLoading: true
tableLoading: true,
isSkeleton:true
}
},
created() {
......@@ -228,11 +231,11 @@ export default {
methods: {
//地区
regionalEconomys() {
this.tableLoading = true
this.isSkeleton = true
if(this.companyInfo){
regionalEconomy(this.params).then(res => {
this.tableData = res.data
this.tableLoading = false
this.isSkeleton = false
})
this.dataRegion(this.companyInfo.provinceId, this.companyInfo.cityId)
}
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue
View file @ 563d64b9
......@@ -87,8 +87,9 @@
</div>
</template>
</head-form>
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<tables
v-if="!isSkeleton"
:tableLoading="tableLoading"
:tableData="tableData"
:forData="forData"
......@@ -118,6 +119,7 @@
<script>
import mixin from '../mixins/mixin'
import skeleton from '../component/skeleton'
import dataRegion from '@/assets/json/dataRegion'
import {
urbanInvestmentPage,
......@@ -127,7 +129,7 @@ export default {
name: 'SameRegion',
mixins: [mixin],
components: {
skeleton
},
props: ['companyId', 'companyInfo'],
data() {
......@@ -200,6 +202,7 @@ export default {
tableLoading:false,
tableData:[],
tableDataTotal:0,
isSkeleton:true
}
},
watch:{
......@@ -338,12 +341,12 @@ export default {
},
handleQuery(params){
this.tableLoading = true
this.isSkeleton = true
let data = params ? params : this.queryParams
urbanInvestmentPage(data).then(res => {
this.tableData = res.data.list
this.tableDataTotal = res.data.totalCount
this.tableLoading = false
this.isSkeleton = false
})
},
//排序
......
dsk-operate-ui/src/views/macro/economies/component/comparison.vue
View file @ 563d64b9
......@@ -108,6 +108,9 @@
export default {
name: 'comparison',
props:['dataQuery','provinceId'],
components: {
},
data() {
return {
queryParams: {
......@@ -292,7 +295,8 @@ export default {
regionData:[],
compareList:[{},{},{},{},{}],
fixed: false,
StyWidth:null
StyWidth:null,
isSkeleton:true
}
},
watch: {
......
dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue
View file @ 563d64b9
<template>
<div class="regionalEconomy">
<div class="flex-box query-box">
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div v-if="!isSkeleton" class="flex-box query-box">
<div class="flex-box query-params">
<span class="common-title">主要指标</span>
<el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
......@@ -15,7 +16,7 @@
<span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div>
</div>
<div class="content">
<div v-if="!isSkeleton" class="content">
<div class="content-left">
<div id="echarts" style="height: 400px"></div>
<p class="tips"> 注：数据均来源于统计公报、统计年鉴，实际披露中由于部分地区最新年度数据不全，导致年份间数据差距较大</p>
......@@ -29,18 +30,19 @@
highlight-current-row
:summary-method="getSummaries"
show-summary
@sort-change="sortChange"
>
<el-table-column label="序号" width="60" align="left">
<template slot-scope="scope">{{ scope.$index + 2 }}</template>
</el-table-column>
<el-table-column label="产业类型" prop="projectType"></el-table-column>
<el-table-column :label="oneYear">
<el-table-column prop="money" label="金额（亿元）" sortable></el-table-column>
<el-table-column prop="rate" label="占比（%）"> </el-table-column>
<el-table-column prop="money" label="金额（亿元）" sortable="custom" :formatter="formatStatus"></el-table-column>
<el-table-column prop="rate" label="占比（%）" sortable> </el-table-column>
</el-table-column>
<el-table-column :label="twoYear">
<el-table-column prop="lastMoney" label="金额（亿元）" sortable> </el-table-column>
<el-table-column prop="lastRate" label="占比（%）" > </el-table-column>
<el-table-column prop="lastMoney" label="金额（亿元）" sortable="custom" :formatter="formatStatus"> </el-table-column>
<el-table-column prop="lastRate" label="占比（%）" sortable> </el-table-column>
</el-table-column>
</el-table>
</div>
......@@ -57,9 +59,13 @@
<script>
import * as echarts from 'echarts';
import { bidGroupCountByProjectType,bidMoneyGroupByProjectType,getYears } from '@/api/macro/macro'
import skeleton from '../../component/skeleton'
export default {
name: 'industrialStructure',
props:['dataQuery','provinceId'],
components: {
skeleton
},
data() {
return {
queryParams: {
......@@ -68,11 +74,13 @@ export default {
},
yearOptions: [],
tableData:[],
tabData:[],
tableLoading: false,
data:[],
oneYear:'',
twoYear:'',
state:false
state:false,
isSkeleton:true
}
},
watch: {
......@@ -86,11 +94,11 @@ export default {
this.yearOptions=res.data.reverse();
this.queryParams.year = this.yearOptions[0].year;
})
this.getData()
this.getGroupCount()
this.$nextTick(()=>{
this.$nextTick(()=>{
this.getData()
this.getGroupCount()
})
},
methods: {
......@@ -112,6 +120,7 @@ export default {
if(this.provinceId.length >= 2){
params.county=this.provinceId[2]
}
bidMoneyGroupByProjectType(params).then(res => {
if(res.data.length > 0){
let list=[]
......@@ -133,16 +142,18 @@ export default {
}
}
for(let i=0; i<list.length; i++){
list[i].money=list[i].money ? Number(list[i].money).toFixed(2) : '-';
// list[i].money=list[i].money ? Number(list[i].money).toFixed(2) : '-';
list[i].rate=list[i].rate ? Number(list[i].rate).toFixed(2) : '-';
list[i].lastMoney=list[i].lastMoney ? Number(list[i].lastMoney).toFixed(2) : '-';
// list[i].lastMoney=list[i].lastMoney ? Number(list[i].lastMoney).toFixed(2) : '-';
list[i].lastRate=list[i].lastRate ? Number(list[i].lastRate).toFixed(2) : '-';
}
this.tableData=list.reverse()
this.tabData=list.reverse()
}
})
},
getGroupCount(){
this.isSkeleton = true
let mydate=new Date();
let startTime=''
let endTime=''
......@@ -164,6 +175,7 @@ export default {
params.county=this.provinceId[2]
}
bidGroupCountByProjectType(params).then(res => {
this.isSkeleton = false
if(res.code === 200){
let list=[]
for(let i=0; i<res.data.length; i++){
......@@ -174,7 +186,9 @@ export default {
}
this.data=list;
// if(list.length > 0){
this.$nextTick(() => {
this.initChart()
})
// }
}
})
......@@ -270,6 +284,47 @@ export default {
});
return sums;
},
sortChange(column) {
if (column.order !== null && column.prop) {
let data1 = [];
let data2 = [];
for (let i = 0; i < this.tableData.length; i++) {
this.tableData[i].money=this.tableData[i].money ? Number(this.tableData[i].money) : 0
this.tableData[i].lastMoney=Number(this.tableData[i].lastMoney)
let temp = null;
temp = this.tableData[i][column.prop];
if (temp === null || typeof temp == "undefined") {
data2.push(this.tableData[i]);
} else {
data1.push(this.tableData[i]);
}
}
if (column.order === "ascending") {
data1 = data1.sort(this.compare(column.prop, "ascending"));
} else {
data1 = data1.sort(this.compare(column.prop, "descending"));
}
this.$nextTick(() => {
this.tableData = data1.concat(data2);
});
}
if (column.order === null) {
this.tableData = this.tabData; // tabData存放的是list副本，不排序时恢复到初始状态
}
this.$forceUpdate()
},
compare(property, type, prop) {
return function(obj1, obj2) {
if (type === "ascending") {
return obj1[property] - obj2[property];
} else {
return obj2[property] - obj1[property];
}
};
},
formatStatus: function(row, column, cellValue) {
return cellValue? Number(cellValue).toFixed(2) : '-'
},
}
}
......
dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue
View file @ 563d64b9
<template>
<div class="regionalEconomy">
<div class="content">
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div v-if="!isSkeleton" class="content">
<div class="flex-box query-box">
<div class="flex-box query-params">
<span class="common-title">经济数据</span>
......@@ -52,15 +53,18 @@
<el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
</div>
</div>
</div>
</template>
<script>
import { nationalPage,getYears } from '@/api/macro/macro'
import skeleton from '../../component/skeleton'
export default {
name: 'localEconomy',
props:['dataQuery','provinceId'],
components: {
skeleton
},
data() {
return {
queryParams: {
......@@ -74,7 +78,8 @@ export default {
pageSize: 20,
tableDataTotal: 0,
show_page:true,
MaxPage:500
MaxPage:500,
isSkeleton:true
}
},
watch: {
......@@ -95,6 +100,7 @@ export default {
},
methods: {
getData(){
this.isSkeleton = true
const params = { pageNum: this.pageIndex, pageSize: this.pageSize, year: this.queryParams.year,type:2 }
if(this.queryParams.field){
params.field=this.queryParams.field
......@@ -113,6 +119,7 @@ export default {
}
// params.provinceIds=[this.dataQuery.provinceId]
nationalPage(params).then(res => {
this.isSkeleton = false
this.tableData = res.data.list
this.tableDataTotal = res.data.totalCount
})
......
dsk-operate-ui/src/views/macro/nationalEconomies/index.vue
View file @ 563d64b9
......@@ -3,25 +3,28 @@
<div class="header">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="全国经济大全" name="first"></el-tab-pane>
<el-tab-pane label="全国招标市场分析" name="second"></el-tab-pane>
<el-tab-pane label="全国商机项目分析" name="second"></el-tab-pane>
<el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>
<el-tab-pane label="全国建筑企业分析" name="fourth"></el-tab-pane>
</el-tabs>
</div>
<Economic v-if="activeName === 'first'"></Economic>
<ZhaoBiao v-if="activeName === 'second'"></ZhaoBiao>
<ZhongBiao v-if="activeName === 'third'"></ZhongBiao>
<Sjxmfx v-if="activeName === 'second'"></Sjxmfx>
<Zhongbiao v-if="activeName === 'third'"></Zhongbiao>
<Jzqyfx v-if="activeName === 'fourth'"></Jzqyfx>
</div>
</template>
<script>
import Economic from './component/qgjjdq'
import ZhaoBiao from './component/zhaobiao'
import ZhongBiao from './component/zhongbiao'
import Sjxmfx from './component/sjxmfx'
import Jzqyfx from './component/jzqyfx'
import Zhongbiao from './component/zhongbiao'
export default {
name: 'NationalEconomies',
components: {
Economic,ZhaoBiao,ZhongBiao
Economic,Sjxmfx,Jzqyfx,Zhongbiao
},
data() {
return {
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ 563d64b9
......@@ -99,35 +99,35 @@
<div class="list-box">
<div class="item">
<div class="left">
<p>{{statistics.count}}<span>家</span></p>
<p>{{statistics.count ? statistics.count:'-'}}<span>家</span></p>
<span>平台家数</span>
</div>
<img src="@/assets/images/urban/img1.png">
</div>
<div class="item">
<div class="left">
<p>{{statistics.creditBalance}}<span>亿元</span></p>
<p>{{statistics.creditBalance ? statistics.creditBalance:'-'}}<span>亿元</span></p>
<span>授信余额</span>
</div>
<img src="@/assets/images/urban/img2.png">
</div>
<div class="item">
<div class="left">
<p>{{statistics.totalAssets}}<span>亿元</span></p>
<p>{{statistics.totalAssets ? statistics.totalAssets:'-'}}<span>亿元</span></p>
<span>资产总额</span>
</div>
<img src="@/assets/images/urban/img3.png">
</div>
<div class="item">
<div class="left">
<p>{{statistics.accountsReceivable}}<span>亿元</span></p>
<p>{{statistics.accountsReceivable ? statistics.accountsReceivable:'-'}}<span>亿元</span></p>
<span>应收账款</span>
</div>
<img src="@/assets/images/urban/img4.png">
</div>
<div class="item">
<div class="left">
<p>{{statistics.nonStandardBalance}}<span>亿元</span></p>
<p>{{statistics.nonStandardBalance ? statistics.nonStandardBalance:'-'}}<span>亿元</span></p>
<span>非标余额</span>
</div>
<img src="@/assets/images/urban/img5.png">
......
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ 563d64b9
......@@ -128,7 +128,6 @@
}
getGZDB(params).then(result=>{
this.datalist = result.code == 200?result:[]
console.log(this.datalist.rows)
if(this.datalist){
this.yqnum = `已逾期 ${this.datalist.rows.length} 条`;
}
......@@ -140,7 +139,6 @@
this.value = ""
},
add(){
// if(this.queryParam.task == '' || this.queryParam.dueTime == '')
if(this.queryParam.task == '')
return this.$message.warning('时间和内容需填写完整！')
......
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ 563d64b9
......@@ -118,7 +118,7 @@
<div class="datalist" v-if="!isSkeleton">
<div class="datali" v-for="(item,index) in datalist">
<div class="det-title" @click="toDetail(item.id,'xmsl')">
{{item.projectName}}<span v-if="activeName!='first' && item.followTime" class="people"><i>{{item.nickName1}}</i>
<span v-html="item.projectName"></span> <span v-if="activeName!='first' && item.followTime" class="people"><i>{{item.nickName1}}</i>
<span v-if="item.provinceName != '' && item.provinceName!==null">{{item.provinceName}}-</span>
{{item.nickName}} <font color="#FA8A00">正在跟进</font></span></div>
<div class="det-tips">
......@@ -206,7 +206,7 @@ export default {
minAmount:'',//投资估算最小值
maxAmount:'',//投资估算最大值
searchParam: {
userId:null,//个人项目需传，公司项目不传
isPrivate:1,//0 公司 1 个人
projectName:'',//项目名称
ownerCompany:'',//业主单位
projectType:'',//项目类型
......@@ -299,9 +299,9 @@ export default {
this.isSkeleton = true
this.searchParam.pageNum = pageNum
if(this.activeName == 'first'){
this.searchParam.userId = this.$store.state.user.userId
this.searchParam.isPrivate = 1
}else{
this.searchParam.userId = null
this.searchParam.isPrivate = 0
}
this.searchParam.ownerCompany = this.searchParam.projectName
getProjectlist(this.searchParam).then(result=>{
......@@ -332,7 +332,7 @@ export default {
this.$refs.myCascader.$refs.panel.activePath = []
})
this.searchParam ={
userId:null,
isPrivate:1,
projectName:'',//项目名称
ownerCompany:'',//业主单位
projectType:'',//项目类型
......
dsk-system/src/main/java/com/dsk/system/domain/business/BusinessBacklog.java
View file @ 563d64b9
......@@ -16,7 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @date 2023-05-17
*/
@Data
public class BusinessBacklog extends BaseEntity
public class BusinessBacklog
{
private static final long serialVersionUID = 1L;
......@@ -49,4 +49,8 @@ public class BusinessBacklog extends BaseEntity
@Excel(name = "状态 0：进行中 1：已到期")
private Integer state;
private Date createTime;
private Date updateTime;
}
dsk-system/src/main/java/com/dsk/system/domain/business/dto/BusinessBacklogListDto.java 0 → 100644
View file @ 563d64b9
package com.dsk.system.domain.business.dto;
import com.dsk.common.annotation.Excel;
import com.dsk.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
* 项目工作待办对象 business_backlog
*
* @author lxl
* @date 2023-05-17
*/
@Data
public class BusinessBacklogListDto extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 项目id */
private Integer businessId;
/** 状态 (0进行中 1已完成 2逾期) */
private Integer state;
private Date startTime;
private Date endTime;
}
dsk-system/src/main/java/com/dsk/system/domain/business/dto/BusinessListDto.java
View file @ 563d64b9
......@@ -11,6 +11,11 @@ import java.util.List;
**/
@Data
public class BusinessListDto {
/**
* 是否私人数据 0：否 1：是
*/
private Integer isPrivate;
/**
* 项目名称
*/
......@@ -19,12 +24,7 @@ public class BusinessListDto {
/**
* 用户id
*/
private Integer userId;
/**
* 用户查看全部他人可见项目标示
*/
private Long others;
private Long userId;
/**
* 省id
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @ 563d64b9
......@@ -245,7 +245,14 @@ public class EnterpriseService {
ArrayList<String> companyNames = new ArrayList<>();
ArrayList<Long> cIds = new ArrayList<>();
for (Object dataMap : list) {
companyNames.add(MapUtils.getString(CommonUtils.assertAsMap(dataMap), "companyName"));
String name = MapUtils.getString(CommonUtils.assertAsMap(dataMap), "companyName");
if (ObjectUtil.isNotEmpty(name) && ObjectUtil.isNotEmpty(body.getKeys())) {
name = name.replaceAll("<font color='red'>","");
name = name.replaceAll("</font>","");
companyNames.add(name);
} else {
companyNames.add(name);
}
cIds.add(MapUtils.getLong(CommonUtils.assertAsMap(dataMap), "companyId"));
}
......@@ -269,6 +276,10 @@ public class EnterpriseService {
companyMap.put("bratingSubjectLevel", null);
String uipId = MapUtils.getString(companyMap, "uipId");
String companyName = MapUtils.getString(companyMap, "companyName", "");
if (ObjectUtil.isNotEmpty(companyName) && ObjectUtil.isNotEmpty(body.getKeys())) {
companyName = companyName.replace("<font color='red'>","");
companyName = companyName.replace("</font>","");
}
Long companyId = MapUtils.getLong(companyMap, "companyId");
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/mapper/BusinessBacklogMapper.java
View file @ 563d64b9
package com.dsk.system.mapper;
import com.dsk.system.domain.business.BusinessBacklog;
import com.dsk.system.domain.business.dto.BusinessBacklogListDto;
import com.dsk.system.domain.business.vo.BusinessBacklogListVo;
import java.util.List;
......@@ -23,11 +24,8 @@ public interface BusinessBacklogMapper
/**
* 查询项目工作待办列表
*
* @param businessBacklog 项目工作待办
* @return 项目工作待办集合
*/
public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklog businessBacklog);
public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklogListDto dto);
/**
* 新增项目工作待办
......
dsk-system/src/main/java/com/dsk/system/service/IBusinessBacklogService.java
View file @ 563d64b9
package com.dsk.system.service;
import com.dsk.system.domain.business.BusinessBacklog;
import com.dsk.system.domain.business.dto.BusinessBacklogListDto;
import com.dsk.system.domain.business.vo.BusinessBacklogListVo;
import java.util.List;
......@@ -23,11 +24,8 @@ public interface IBusinessBacklogService
/**
* 查询项目工作待办列表
*
* @param businessBacklog 项目工作待办
* @return 项目工作待办集合
*/
public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklog businessBacklog);
public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklogListDto dto);
/**
* 新增项目工作待办
......
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessBacklogServiceImpl.java
View file @ 563d64b9
......@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.dsk.system.domain.business.BusinessBacklog;
import com.dsk.common.exception.base.BaseException;
import com.dsk.common.utils.DateUtils;
import com.dsk.system.domain.business.dto.BusinessBacklogListDto;
import com.dsk.system.domain.business.vo.BusinessBacklogListVo;
import com.dsk.system.mapper.BusinessBacklogMapper;
import com.dsk.system.service.IBusinessBacklogService;
......@@ -43,15 +44,31 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService {
/**
* 查询项目工作待办列表
*
* @param businessBacklog 项目工作待办
* @param dto 项目工作待办
* @return 项目工作待办
*/
@Override
public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklog businessBacklog) {
if (ObjectUtil.isEmpty(businessBacklog.getBusinessId())) {
public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklogListDto dto) {
if (ObjectUtil.isEmpty(dto.getBusinessId())) {
throw new BeanException("项目id不能为空！");
}
return businessBacklogMapper.selectBusinessBacklogList(businessBacklog);
if (ObjectUtil.isEmpty(dto.getState())) {
throw new BeanException("工作代办状态不能为空！");
}
switch (dto.getState()){
case 0:
dto.setStartTime(new Date());
break;
case 1:
break;
case 2:
dto.setState(0);
dto.setEndTime(new Date());
break;
default:
throw new BeanException("工作代办状态参数错误！");
}
return businessBacklogMapper.selectBusinessBacklogList(dto);
}
/**
......
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java
View file @ 563d64b9
......@@ -9,10 +9,7 @@ import com.dsk.acc.openapi.client.util.CommonUtils;
import com.dsk.common.config.RuoYiConfig;
import com.dsk.common.constant.HttpStatus;
import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.core.domain.entity.BusinessInfo;
import com.dsk.common.core.domain.entity.BusinessLabel;
import com.dsk.common.core.domain.entity.BusinessRelateCompany;
import com.dsk.common.core.domain.entity.BusinessUser;
import com.dsk.common.core.domain.entity.*;
import com.dsk.common.exception.ServiceException;
import com.dsk.common.exception.base.BaseException;
import com.dsk.common.utils.*;
......@@ -95,18 +92,12 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
*/
@Override
public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
List<BusinessListVo> othersList = new ArrayList<>();
//userId不传值，就查询全部他人可见项目+自己的
if (dto.getUserId() == null) {
dto.setOthers(SecurityUtils.getUserId());
//查询他人可见项目
othersList = businessInfoMapper.selectBusinessInfoList(dto);
SysUser user = SecurityUtils.getLoginUser().getUser();
dto.setUserId(user.getUserId());
if(user.getIsExperience() == 1){
dto.setIsPrivate(1);
}
dto.setOthers(null);
//查询自己参与的项目
List<BusinessListVo> businessList = businessInfoMapper.selectBusinessInfoList(dto);
businessList.addAll(othersList);
return businessList;
return businessInfoMapper.selectBusinessInfoList(dto);
}
@Override
......
dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java
View file @ 563d64b9
......@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsk.common.annotation.DataScope;
import com.dsk.common.core.domain.R;
import com.dsk.common.core.domain.entity.SysUser;
import com.dsk.common.exception.ServiceException;
import com.dsk.common.utils.SecurityUtils;
import com.dsk.common.utils.StringUtils;
......
dsk-system/src/main/java/com/dsk/system/service/impl/UrbanInvestmentPlatformServiceImpl.java
View file @ 563d64b9
......@@ -5,6 +5,7 @@ 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;
import com.dsk.common.dtos.UrbanInvestmentPlatformSubjectLevelDto;
import com.dsk.common.utils.DskOpenApiUtil;
import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
import com.dsk.system.service.ICustomerService;
......@@ -15,10 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* @ClassName EconomicServiceImpl
......@@ -52,7 +50,14 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
ArrayList<String> companyNames = new ArrayList<>();
ArrayList<Long> cIds = new ArrayList<>();
for (Object dataMap : list) {
companyNames.add(MapUtils.getString(CommonUtils.assertAsMap(dataMap), "companyName"));
String name = MapUtils.getString(CommonUtils.assertAsMap(dataMap), "companyName");
if (ObjectUtil.isNotEmpty(name) && ObjectUtil.isNotEmpty(pageDto.getKeyword())) {
name = name.replace("<font color='red'>","");
name = name.replace("</font>","");
companyNames.add(name);
} else {
companyNames.add(name);
}
cIds.add(MapUtils.getLong(CommonUtils.assertAsMap(dataMap), "companyId"));
}
List<CustomerStatusListVo> customerStatusListVos = iCustomerService.selectStatusListByCompanyName(companyNames);
......@@ -76,6 +81,10 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
Long companyId = MapUtils.getLong(companyMap, "companyId");
String uipId = MapUtils.getString(companyMap, "uipId");
String companyName = MapUtils.getString(companyMap, "companyName", "");
if (ObjectUtil.isNotEmpty(companyName) && ObjectUtil.isNotEmpty(pageDto.getKeyword())) {
companyName = companyName.replace("<font color='red'>","");
companyName = companyName.replace("</font>","");
}
companyMap.put("claimStatus", 0);
companyMap.put("bratingSubjectLevel", null);
for (CustomerStatusListVo vo : customerStatusListVos) {
......@@ -83,11 +92,19 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
companyMap.put("claimStatus", 1);
}
}
// 去除重复的数据
Set<UrbanInvestmentPlatformSubjectLevelDto> subjectLevelDtoSet = new HashSet<>();
for (Map<String, Object> m : objArrayList) {
UrbanInvestmentPlatformSubjectLevelDto dto = new UrbanInvestmentPlatformSubjectLevelDto();
Long companyIdCredit = MapUtils.getLong(m, "companyId", 0L);
if (companyIdCredit.equals(companyId)) {
companyMap.put("bratingSubjectLevel", m.get("bratingSubjectLevel"));
String rate = MapUtils.getString(m, "bratingSubjectLevel");
dto.setCompanyId(companyIdCredit);
dto.setBratingSubjectLevel(rate);
subjectLevelDtoSet.add(dto);
}
for (UrbanInvestmentPlatformSubjectLevelDto dto : subjectLevelDtoSet) {
if (dto.getCompanyId().equals(companyId)) {
companyMap.put("bratingSubjectLevel", dto.getBratingSubjectLevel());
}
}
}
......
dsk-system/src/main/resources/mapper/business/BusinessBacklogMapper.xml
View file @ 563d64b9
......@@ -28,14 +28,13 @@
from business_backlog
</sql>
<select id="selectBusinessBacklogList" parameterType="com.dsk.system.domain.business.vo.BusinessBacklogListVo"
resultMap="BusinessBacklogResult">
<select id="selectBusinessBacklogList" parameterType="com.dsk.system.domain.business.dto.BusinessBacklogListDto"
resultType="com.dsk.system.domain.business.vo.BusinessBacklogListVo">
<include refid="selectBusinessBacklogVo"/>
where business_id = #{businessId}
<if test="target != null and target != ''">and target = #{target}</if>
<if test="task != null and task != ''">and task = #{task}</if>
<if test="finishTime != null ">and finish_time = #{finishTime}</if>
<if test="state != null ">and state = #{state}</if>
<if test="state != null "> and state = #{state} </if>
<if test="startTime != null "> and(due_time &gt;= #{startTime} or due_time is null) </if>
<if test="endTime != null "> and due_time &lt;= #{endTime} </if>
ORDER BY create_time DESC
</select>
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ 563d64b9
......@@ -105,9 +105,12 @@
LEFT JOIN business_label l on l.business_id = i.id
LEFT JOIN sys_user u on u.user_id = bu.user_id
<where>
<if test="userId != null">
<if test="isPrivate == 1 ">
and bu.user_id = #{userId}
</if>
<if test="isPrivate == 0 ">
and (bu.user_id = #{userId} or i.is_private = 1)
</if>
<if test="projectType != null and projectType != ''">
and i.project_type in
<foreach collection="projectType" item="projectType" open="(" separator="," close=")">
......@@ -123,85 +126,27 @@
</foreach>
</if>
<if test="projectName != null and projectName != ''">
and i.project_name like concat('%',#{projectName},'%')
</if>
<if test="ownerCompany != null and ownerCompany != ''">
or i.construction_unit like concat('%',#{ownerCompany},'%')
</if>
<if test="others != null">
and bu.user_id != #{others} and i.is_private = 1
and ( i.project_name like concat('%',#{projectName},'%')
or i.construction_unit like concat('%',#{projectName},'%') )
</if>
<if test="provinceId != null and provinceId.size > 0 and cityId == null and districtId == null">
<if test="provinceId != null and provinceId.size > 0 ">
and i.province_id in
<foreach collection="provinceId" item="provinceId" open="(" separator="," close=")">
#{provinceId}
</foreach>
</if>
<if test="cityId != null and cityId.size > 0 and provinceId == null and districtId == null">
<if test="cityId != null and cityId.size > 0 ">
and i.city_id in
<foreach collection="cityId" item="cityId" open="(" separator="," close=")">
#{cityId}
</foreach>
</if>
<if test="districtId != null and districtId.size > 0 and provinceId == null and cityId == null">
<if test="districtId != null and districtId.size > 0">
and i.district_id in
<foreach collection="districtId" item="districtId" open="(" separator="," close=")">
#{districtId}
</foreach>
</if>
<if test="provinceId != null and provinceId.size > 0 and cityId != null and cityId.size > 0 and districtId == null">
and (
i.province_id in
<foreach collection="provinceId" item="provinceId" open="(" separator="," close=")">
#{provinceId}
</foreach>
or i.city_id in
<foreach collection="cityId" item="cityId" open="(" separator="," close=")">
#{cityId}
</foreach>
)
</if>
<if test="provinceId != null and provinceId.size > 0 and districtId != null and districtId.size > 0 and cityId == null">
and (
i.province_id in
<foreach collection="provinceId" item="provinceId" open="(" separator="," close=")">
#{provinceId}
</foreach>
or i.district_id in
<foreach collection="districtId" item="districtId" open="(" separator="," close=")">
#{districtId}
</foreach>
)
</if>
<if test="cityId != null and cityId.size > 0 and districtId != null and districtId.size > 0 and provinceId ==null">
and (
i.city_id in
<foreach collection="cityId" item="cityId" open="(" separator="," close=")">
#{cityId}
</foreach>
or i.district_id in
<foreach collection="districtId" item="districtId" open="(" separator="," close=")">
#{districtId}
</foreach>
)
</if>
<if test="provinceId != null and provinceId.size > 0 and cityId != null and cityId.size > 0 and districtId != null and districtId.size > 0">
and (
i.province_id in
<foreach collection="provinceId" item="provinceId" open="(" separator="," close=")">
#{provinceId}
</foreach>
or i.city_id in
<foreach collection="cityId" item="cityId" open="(" separator="," close=")">
#{cityId}
</foreach>
or i.district_id in
<foreach collection="districtId" item="districtId" open="(" separator="," close=")">
#{districtId}
</foreach>
)
</if>
</where>
GROUP BY i.id
ORDER BY i.create_time DESC
......
dsk-system/src/main/resources/mapper/system/SysUserMapper.xml
View file @ 563d64b9
......@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="delFlag" column="del_flag" />
<result property="loginIp" column="login_ip" />
<result property="loginDate" column="login_date" />
<result property="isExperience" column="is_experience"/>
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
......@@ -47,7 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber,
u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.is_experience, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
......@@ -57,7 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
u.del_flag, u.login_ip, u.login_date, u.is_experience, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0'
<if test="userId != null and userId != 0">
......@@ -154,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sex != null and sex != ''">sex,</if>
<if test="password != null and password != ''">password,</if>
<if test="status != null and status != ''">status,</if>
<if test="isExperience != null ">is_experience,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
create_time
......@@ -168,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sex != null and sex != ''">#{sex},</if>
<if test="password != null and password != ''">#{password},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="isExperience != null ">#{isExperience},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
sysdate()
......@@ -188,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">status = #{status},</if>
<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
<if test="loginDate != null">login_date = #{loginDate},</if>
<if test="isExperience != null">is_experience = #{isExperience},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
update_time = sysdate()
......
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