From fea8e0742ee241a94c5bbd4f452d6ad82cf4dd9c Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 06 二月 2026 10:58:26 +0800
Subject: [PATCH] 功能开发
---
server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
index 82ba88b..8a5874f 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
@@ -159,8 +159,8 @@
queryWrapper.eq(pageWrap.getModel().getDoneNum() != null,ImportRecord::getDoneNum, pageWrap.getModel().getDoneNum());
queryWrapper.eq(pageWrap.getModel().getErrorNum() != null,ImportRecord::getErrorNum, pageWrap.getModel().getErrorNum());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getUpdateUserName()),SystemUser::getRealname, pageWrap.getModel().getUpdateUserName());
- queryWrapper.ge(pageWrap.getModel().getEndtime() != null,ImportRecord::getCreateTime, pageWrap.getModel().getEndtime());
- queryWrapper.ne(pageWrap.getModel().getStarttime() != null,ImportRecord::getCreateTime, pageWrap.getModel().getStarttime());
+ queryWrapper.ge(pageWrap.getModel().getStarttime() != null,ImportRecord::getCreateTime, pageWrap.getModel().getStarttime());
+ queryWrapper.le(pageWrap.getModel().getEndtime() != null,ImportRecord::getCreateTime, pageWrap.getModel().getEndtime());
queryWrapper.orderByDesc(ImportRecord::getId);
return PageData.from(importRecordMapper.selectPage(page, queryWrapper));
}
@@ -180,7 +180,7 @@
try {
List<Category> categoryList = null;
if(type == 0){
- categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda().eq(Category::getDeleted,Constants.ZERO));
+ categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda().eq(Category::getDeleted,Constants.ZERO).eq(Category::getStatus,Constants.ZERO));
if(categoryList == null || categoryList.size()==0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝 璇诲彇鑰佸笀鍩烘暟鏁版嵁閰嶇疆鍑洪敊锛岃鍏堥厤缃熀纭�鏁版嵁淇℃伅锛�");
}
@@ -289,9 +289,13 @@
if(StringUtils.isBlank(param.getTypeNames())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 鍟嗕笟鍖栫被鍨嬩俊鎭笉鑳戒负绌�");
}
+ if(StringUtils.isBlank(param.getFieldNames())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 鎿呴暱棰嗗煙淇℃伅涓嶈兘涓虹┖");
+ }
if(StringUtils.isBlank(param.getFee())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹紝 璐圭敤鏍囧噯淇℃伅涓嶈兘涓虹┖");
}
+
/* if(pics!=null && StringUtils.isNotBlank(param.getImgurl())){
log.info("===================="+param.getImgurl());
int start = param.getImgurl().indexOf("(\"")+2;
@@ -340,7 +344,8 @@
member.setFee(new BigDecimal(param.getFee()));
}catch (Exception e){
}
- member.setSex(StringUtils.equals(param.getSex(),"鐢�")?Constants.ZERO:(StringUtils.equals(param.getSex(),"濂�")?Constants.ZERO:null));
+ member.setSex(StringUtils.equals(param.getSex(),"鐢�")?Constants.ZERO:
+ (StringUtils.equals(param.getSex(),"濂�")?Constants.ONE:null));
member.setZhanquIds(getIdStrListByList(list0));
member.setBustypeIds(getIdStrListByList(list1));
member.setFieldIds(getIdStrListByList(list2));
@@ -508,7 +513,7 @@
List<ImportRecord> records = importRecordMapper.selectList(new QueryWrapper<ImportRecord>()
.select("id,total_num,(select count(c.id) from cases c where c.import_id= import_record.id) as doneNum")
.lambda()
- .eq(ImportRecord::getDetail,Constants.ZERO)
+ .eq(ImportRecord::getDeleted,Constants.ZERO)
.ne(ImportRecord::getStatus,Constants.TWO)
);
for(ImportRecord importRecord : records){
--
Gitblit v1.9.3