yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

客户文件

Browse Source
jg-waiwang-pro
vayne 9 months ago
parent 4a3906496a
commit cefd17187e
5 changed files with 23 additions and 45 deletions
Show Stats Download Patch File Download Diff File

8
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/SubjectBasicService.java
Unescape View File

@ -1,10 +1,10 @@
package jnpf.service;
import jnpf.model.subjectbasic.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jnpf.model.subjectbasic.SubjectBasicForm;
import jnpf.model.subjectbasic.SubjectBasicPagination;
/**
* 客户中心
@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
public interface SubjectBasicService extends IService<SubjectBasicEntity> {
List<SubjectBasicEntity> getList(SubjectBasicPagination subjectBasicPagination);
List<SubjectBasicEntity> getTypeList(SubjectBasicPagination subjectBasicPagination,String dataType);
List<SubjectBasicEntity> getTypeList(SubjectBasicPagination subjectBasicPagination, String dataType);
SubjectBasicEntity getInfo(String id);
@ -32,7 +32,7 @@ public interface SubjectBasicService extends IService<SubjectBasicEntity> {
List<SubjectContactsEntity> getSubjectContactsList(String id);
//副表数据方法
String checkForm(SubjectBasicForm form,int i);
String checkForm(SubjectBasicForm form, int i);
void saveOrUpdate(SubjectBasicForm subjectBasicForm,String id, boolean isSave) throws Exception;

5
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/SubjectContactsService.java
Unescape View File

@ -1,10 +1,9 @@
package jnpf.service;
import jnpf.model.subjectbasic.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jnpf.model.subjectbasic.SubjectBasicPagination;
/**
* 客户中心
@ -14,5 +13,5 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* 日期： 2024-01-17
*/
public interface SubjectContactsService extends IService<SubjectContactsEntity> {
QueryWrapper<SubjectContactsEntity> getChild(SubjectBasicPagination pagination,QueryWrapper<SubjectContactsEntity> subjectContactsQueryWrapper);
QueryWrapper<SubjectContactsEntity> getChild(SubjectBasicPagination pagination, QueryWrapper<SubjectContactsEntity> subjectContactsQueryWrapper);
}

17
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SubjectBasicServiceImpl.java
Unescape View File

@ -2,16 +2,14 @@ package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.SubjectBasicMapper;
import jnpf.model.subjectbasic.SubjectBasicConstant;
import jnpf.model.subjectbasic.SubjectBasicForm;
import jnpf.model.subjectbasic.SubjectBasicPagination;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.subjectbasic.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
@ -25,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo;
@ -317,8 +314,8 @@ public class SubjectBasicServiceImpl extends ServiceImpl<SubjectBasicMapper, Sub
}
/** SubjectContacts子表方法 */
@Override
public List<SubjectContactsEntity> getSubjectContactsList(String id,SubjectBasicPagination subjectBasicPagination){
Map<String, Object> newtabMap=SubjectBasicConstant.TABLEFIELDKEY.entrySet()
public List<SubjectContactsEntity> getSubjectContactsList(String id, SubjectBasicPagination subjectBasicPagination){
Map<String, Object> newtabMap= SubjectBasicConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="subjectContacts";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
@ -338,7 +335,7 @@ public class SubjectBasicServiceImpl extends ServiceImpl<SubjectBasicMapper, Sub
}
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
@Override
public String checkForm(SubjectBasicForm form,int i) {
public String checkForm(SubjectBasicForm form, int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
String countRecover = "";

22
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SubjectContactsServiceImpl.java
Unescape View File

@ -2,31 +2,17 @@ package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.SubjectContactsMapper;
import jnpf.model.subjectbasic.SubjectBasicConstant;
import jnpf.model.subjectbasic.SubjectBasicPagination;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.subjectbasic.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* 客户中心
@ -49,7 +35,7 @@ public class SubjectContactsServiceImpl extends ServiceImpl<SubjectContactsMappe
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String ruleQueryJson = isPc?SubjectBasicConstant.getColumnData():SubjectBasicConstant.getAppColumnData();
String ruleQueryJson = isPc? SubjectBasicConstant.getColumnData():SubjectBasicConstant.getAppColumnData();
ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
if(isPc){

16
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/SubjectBasicController.java
Unescape View File

@ -1,32 +1,28 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.model.*;
import jnpf.model.subjectbasic.*;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.subjectbasic.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
@ -424,7 +420,7 @@ public class SubjectBasicController {
String id = model.getId();
Map<String, Object> result = model.getResultData();
if(StringUtil.isNotEmpty(id)){
update(id, JsonUtil.getJsonToBean(result,SubjectBasicForm.class), true);
update(id, JsonUtil.getJsonToBean(result, SubjectBasicForm.class), true);
}else {
create( JsonUtil.getJsonToBean(result,SubjectBasicForm.class));
}

Write Preview
Loading…
Cancel
Save