客户绑定业务线

jg-waiwang-pro
胡川虎 9 months ago
parent 806ef0a938
commit 279ef25659

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
public interface SubjectbasicMapper extends BaseMapper<SubjectbasicEntity> {

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
public interface SubjectbusinesslineMapper extends BaseMapper<SubjectbusinesslineEntity> {

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
public interface SubjectcontactsMapper extends BaseMapper<SubjectcontactsEntity> {

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
public interface SubjectproductblacklistMapper extends BaseMapper<SubjectproductblacklistEntity> {

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
public interface SubjectrepresentativeMapper extends BaseMapper<SubjectrepresentativeEntity> {

@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
public interface SubjectbasicService extends IService<SubjectbasicEntity> {
List<SubjectbasicEntity> getList(SubjectbasicPagination subjectbasicPagination);

@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
public interface SubjectbusinesslineService extends IService<SubjectbusinesslineEntity> {
QueryWrapper<SubjectbusinesslineEntity> getChild(SubjectbasicPagination pagination,QueryWrapper<SubjectbusinesslineEntity> subjectbusinesslineQueryWrapper);

@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
public interface SubjectcontactsService extends IService<SubjectcontactsEntity> {
QueryWrapper<SubjectcontactsEntity> getChild(SubjectbasicPagination pagination,QueryWrapper<SubjectcontactsEntity> subjectcontactsQueryWrapper);

@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
public interface SubjectproductblacklistService extends IService<SubjectproductblacklistEntity> {
QueryWrapper<SubjectproductblacklistEntity> getChild(SubjectbasicPagination pagination,QueryWrapper<SubjectproductblacklistEntity> subjectproductblacklistQueryWrapper);

@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
public interface SubjectrepresentativeService extends IService<SubjectrepresentativeEntity> {
QueryWrapper<SubjectrepresentativeEntity> getChild(SubjectbasicPagination pagination,QueryWrapper<SubjectrepresentativeEntity> subjectrepresentativeQueryWrapper);

@ -36,7 +36,7 @@ import jnpf.permission.entity.UserEntity;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
@Service
public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, SubjectbasicEntity> implements SubjectbasicService{
@ -324,6 +324,7 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
subjectbasicQueryWrapper.lambda().like(SubjectbasicEntity::getName,value);
}
if(ObjectUtil.isNotEmpty(subjectbasicPagination.getCustomerStarRating())){
subjectbasicNum++;
@ -352,6 +353,7 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
});
}
if(ObjectUtil.isNotEmpty(subjectbasicPagination.getSubjectBasicType())){
subjectbasicNum++;
@ -361,6 +363,7 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
subjectbasicQueryWrapper.lambda().like(SubjectbasicEntity::getSubjectBasicType,value);
}
}
if(subjectcontactsNum>0){
List<String> subjectcontactsIdList = subjectcontactsService.list(subjectcontactsQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getSubjectBasicId())).map(t->t.getSubjectBasicId()).collect(Collectors.toList());

@ -33,7 +33,7 @@ import jnpf.permission.entity.UserEntity;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
@Service
public class SubjectbusinesslineServiceImpl extends ServiceImpl<SubjectbusinesslineMapper, SubjectbusinesslineEntity> implements SubjectbusinesslineService{

@ -33,7 +33,7 @@ import jnpf.permission.entity.UserEntity;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
@Service
public class SubjectcontactsServiceImpl extends ServiceImpl<SubjectcontactsMapper, SubjectcontactsEntity> implements SubjectcontactsService{

@ -33,7 +33,7 @@ import jnpf.permission.entity.UserEntity;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
@Service
public class SubjectproductblacklistServiceImpl extends ServiceImpl<SubjectproductblacklistMapper, SubjectproductblacklistEntity> implements SubjectproductblacklistService{

@ -33,7 +33,7 @@ import jnpf.permission.entity.UserEntity;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
@Service
public class SubjectrepresentativeServiceImpl extends ServiceImpl<SubjectrepresentativeMapper, SubjectrepresentativeEntity> implements SubjectrepresentativeService{

@ -54,7 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-02-01
*/
@Slf4j
@RestController
@ -216,6 +216,9 @@ public class SubjectbasicController {
case "calssify" :
entitys.add(new ExcelExportEntity("客户分类" ,"calssify"));
break;
case "subjectBasicType" :
entitys.add(new ExcelExportEntity("主体类型" ,"subjectBasicType"));
break;
case "logo" :
entitys.add(new ExcelExportEntity("公司logo" ,"logo"));
break;
@ -430,13 +433,7 @@ public class SubjectbasicController {
tableField119List.add(new ExcelExportEntity("授权/证明文件" ,"authorizeFiles"));
break;
case "tableField188-businessLineId":
tableField188List.add(new ExcelExportEntity("业务线主键" ,"businessLineId"));
break;
case "tableField188-busunessLineCode":
tableField188List.add(new ExcelExportEntity("业务线编码" ,"busunessLineCode"));
break;
case "tableField188-busunessLineName":
tableField188List.add(new ExcelExportEntity("业务线名称" ,"busunessLineName"));
tableField188List.add(new ExcelExportEntity("关联业务线" ,"businessLineId"));
break;
case "tableField173-logo":
tableField173List.add(new ExcelExportEntity("联系人头像" ,"logo"));

@ -9,7 +9,7 @@ import java.util.Date;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-31
* @ 2024-02-01
*/
@Data
@TableName("jg_subject_basic")

@ -9,7 +9,7 @@ import java.util.Date;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-02-01
*/
@Data
@TableName("jg_subject_businessline")
@ -20,9 +20,9 @@ public class SubjectbusinesslineEntity {
private String subjectBasicId;
@TableField(value = "BUSINESS_LINE_ID" , updateStrategy = FieldStrategy.IGNORED)
private String businessLineId;
@TableField(value = "BUSUNESS_LINE_CODE" , updateStrategy = FieldStrategy.IGNORED)
@TableField("BUSUNESS_LINE_CODE")
private String busunessLineCode;
@TableField(value = "BUSUNESS_LINE_NAME" , updateStrategy = FieldStrategy.IGNORED)
@TableField("BUSUNESS_LINE_NAME")
private String busunessLineName;
@TableField("F_CREATOR_TIME")
private Date creatorTime;

@ -9,7 +9,7 @@ import java.util.Date;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-02-01
*/
@Data
@TableName("jg_subject_contacts")
@ -56,4 +56,6 @@ public class SubjectcontactsEntity {
private Integer deleteMark;
@TableField("F_TENANT_ID")
private String tenantId;
@TableField("F_FLOW_ID")
private String flowId;
}

@ -9,7 +9,7 @@ import java.util.Date;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-02-01
*/
@Data
@TableName("jg_subject_product_blacklist")

@ -9,7 +9,7 @@ import java.util.Date;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-02-01
*/
@Data
@TableName("jg_subject_representative")

@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-31
* @ 2024-02-01
*/
@Data
public class SubjectbasicForm {

@ -11,7 +11,7 @@ import java.util.List;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-31
* @ 2024-02-01
*/
@Data
public class SubjectbasicPagination extends Pagination {

@ -14,17 +14,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* V3.5
* : https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
@Data
public class SubjectbusinesslineModel {
/** 业务线主键 **/
/** 关联业务线 **/
@JSONField(name = "businessLineId")
private String businessLineId;
/** 业务线编码 **/
@JSONField(name = "busunessLineCode")
private String busunessLineCode;
/** 业务线名称 **/
@JSONField(name = "busunessLineName")
private String busunessLineName;
}

@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* V3.5
* : https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
@Data
public class SubjectcontactsModel {

@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* V3.5
* : https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
@Data
public class SubjectproductblacklistModel {

@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* V3.5
* : https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-02-01
*/
@Data
public class SubjectrepresentativeModel {

@ -401,46 +401,23 @@
</div>
<el-table :data="dataForm.subjectbusinesslineList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="业务线主键" v-if="judgeShow('subjectbusinessline-businessLineId')"
<el-table-column label="关联业务线" v-if="judgeShow('subjectbusinessline-businessLineId')"
prop="businessLineId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('subjectbusinesslineList-businessLineId')">*</span>业务线主键
v-if="judgeRequired('subjectbusinesslineList-businessLineId')">*</span>关联业务线
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.businessLineId"
@change="changeData('subjectbusinessline-businessLineId',scope.$index)" placeholder="请输入"
<JnpfPopupSelect v-model="scope.row.businessLineId"
@change="changeData('subjectbusinessline-businessLineId',scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.subjectbusinesslinebusinessLineId"
placeholder="请选择"
:disabled="judgeWrite('subjectbusinesslineList')||judgeWrite('subjectbusinesslineList-businessLineId')"
readonly clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="业务线编码" v-if="judgeShow('subjectbusinessline-busunessLineCode')"
prop="busunessLineCode">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('subjectbusinesslineList-busunessLineCode')">*</span>业务线编码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.busunessLineCode"
@change="changeData('subjectbusinessline-busunessLineCode',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('subjectbusinesslineList')||judgeWrite('subjectbusinesslineList-busunessLineCode')"
readonly clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="业务线名称" v-if="judgeShow('subjectbusinessline-busunessLineName')"
prop="busunessLineName">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('subjectbusinesslineList-busunessLineName')">*</span>业务线名称
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.busunessLineName"
@change="changeData('subjectbusinessline-busunessLineName',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('subjectbusinesslineList')||judgeWrite('subjectbusinesslineList-busunessLineName')"
readonly clearable :style='{"width":"100%"}'>
</JnpfInput>
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:field="'businessLineId'+scope.$index" interfaceId="517979330417001669" :pageSize="20"
:columnOptions="subjectbusinesslinebusinessLineIdcolumnOptions" clearable
:style='{"width":"100%"}'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="操作" width="50" v-if="!judgeWrite('subjectbusinesslineList')">
@ -452,7 +429,7 @@
</el-table>
<div class="table-actions" @click="addsubjectbusinesslineList()"
v-if="!judgeWrite('subjectbusinesslineList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
<el-button type="text" icon="el-icon-plus">添加业务线</el-button>
</div>
</jnpf-form-tip-item>
</el-col>
@ -1283,28 +1260,10 @@
"hasPage": true,
"popupTitle": "选择数据",
"pageSize": 20,
"columnOptions": [{
"label": "业务线编号",
"value": "code"
}, {
"label": "业务线名称",
"value": "name"
}],
"interfaceId": "517979330417001669",
"interfaceName": "查询业务线列表",
"relationOptions": [{
"field": "businessLineId",
"type": 1,
"value": "id"
}, {
"field": "busunessLineCode",
"type": 1,
"value": "code"
}, {
"field": "busunessLineName",
"type": 1,
"value": "name"
}],
"columnOptions": [],
"interfaceId": "",
"interfaceName": "",
"relationOptions": [],
"templateJson": [],
"popupWidth": "800px"
},
@ -1407,10 +1366,6 @@
subjectbusinesslineList: {
businessLineId: '',
businessLineIdOptions: [],
busunessLineCode: '',
busunessLineCodeOptions: [],
busunessLineName: '',
busunessLineNameOptions: [],
enabledmark: undefined
},
subjectcontactsList: {
@ -1947,6 +1902,13 @@
"label": "fullName",
"value": "id"
},
subjectbusinesslinebusinessLineIdcolumnOptions: [{
"label": "业务线编码",
"value": "code"
}, {
"label": "业务线名称",
"value": "name"
}, ],
subjectcontactscontactsTypeOptions: [{
"fullName": "默认",
"id": "1"
@ -2035,8 +1997,6 @@
subjectrepresentativeidCardPhoto3: [],
subjectrepresentativeauthorizeFiles: [],
subjectbusinesslinebusinessLineId: [],
subjectbusinesslinebusunessLineCode: [],
subjectbusinesslinebusunessLineName: [],
subjectcontactslogo: [],
subjectcontactscontactsType: [],
subjectcontactsname: [],
@ -2507,9 +2467,7 @@
},
addsubjectbusinesslineList() {
let item = {
businessLineId: undefined,
busunessLineCode: undefined,
busunessLineName: undefined,
businessLineId: '',
}
this.getsubjectbusinesslineList(item)
},

Loading…
Cancel
Save