emGcrls);
- void generate();
+ void generate(String nf);
}
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java
index a305152..7c3649d 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java
@@ -10,16 +10,20 @@ import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
import com.dsic.gj_erp.dao.jcsj.EmGcrlRepository;
import com.dsic.gj_erp.mapper.jcsj.EmGcrlMapper;
import com.dsic.gj_erp.service.jcsj.EmGcrlService;
+import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
+import java.time.DayOfWeek;
import java.time.LocalDate;
+import java.time.Period;
import java.time.Year;
-import java.util.Date;
-import java.util.List;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.WeekFields;
+import java.util.*;
/**
*
@@ -38,11 +42,15 @@ public class EmGcrlServiceImpl extends ServiceImpl impleme
EmGcrlRepository emGcrlRepository;
+ String[] weekArray = { "一", "二", "三", "四", "五", "六","日"};
+
@Override
public List getList(JSONObject json) {
QueryWrapper queryWrapper=new QueryWrapper<>();
if(StringUtils.isNotEmpty(json.getString("nf"))){
queryWrapper.eq("NF",json.getString("nf"));
+ }else{
+ queryWrapper.eq("NF", Calendar.getInstance().get(Calendar.YEAR));
}
queryWrapper.orderByDesc("gl");
List emGcrls=emGcrlMapper.selectList(queryWrapper);
@@ -58,19 +66,36 @@ public class EmGcrlServiceImpl extends ServiceImpl impleme
}
@Override
- public void generate() {
- String nf=Year.now().toString();
+ public void generate(String nf) {
List emGcrlRepositoryByNf=emGcrlRepository.findByNf(nf);
if (ObjectUtil.isEmpty(emGcrlRepositoryByNf)){
- EmGcrl emGcrl=new EmGcrl();
- Date date = new Date();//获取当前时间
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");//定义日期格式
- String dateString = dateFormat.format(date);
- emGcrl.setNf(nf);
- emGcrl.setGl(dateString);
- // emGcrl.setXh("1");
- emGcrlMapper.insert(emGcrl);
- // this.save(emGcrl);
+ Integer intNF=Integer.parseInt(nf);
+ LocalDate startDate = LocalDate.of(intNF, 1, 1); // 起始日期：2022年1月1日
+ LocalDate endDate = LocalDate.of(intNF, 12, 31); // 结束日期：2022年12月31日
+ List saveList=new ArrayList<>();
+ LocalDate currentDate = startDate;
+ while (currentDate.isBefore(endDate) || currentDate.isEqual(endDate)) {
+ EmGcrl emGcrl=new EmGcrl();
+ emGcrl.setNf(nf);
+ String gl = currentDate.format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
+ emGcrl.setGl(gl);
+ WeekFields weekFields = WeekFields.of(Locale.getDefault());
+ Integer weekOfYear = currentDate.get(weekFields.weekOfYear());
+ emGcrl.setNz(weekOfYear.toString());
+ Integer weekOfMonth = currentDate.get(weekFields.weekOfMonth());
+ emGcrl.setYz(weekOfMonth.toString());
+ DayOfWeek dayOfWeek = currentDate.getDayOfWeek();
+ Integer zj=dayOfWeek.getValue();
+ emGcrl.setXq(weekArray[zj-1]);
+ if(zj==6||zj==7){
+ emGcrl.setXxr("0");
+ }else {
+ emGcrl.setXh("1");
+ }
+ saveList.add(emGcrl);
+ currentDate = currentDate.plusDays(1); // 增加一天，处理下一个日期
+ }
+ saveBatch(saveList);
}
}
}
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java
index 5239da3..d072c7e 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java
@@ -6,6 +6,7 @@ import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
import com.dsic.gj_erp.bean.jhgk.DmXbjh;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
@@ -23,7 +24,7 @@ public interface DmJtsyjhService extends IService {
List upload(MultipartFile file) throws IOException;
- void save(List dmJtsyjhs);
+ void save(HttpServletRequest request, List dmJtsyjhs);
void tj(List dmJtsyjhs);
}
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java
index 8fb5ca2..a8f4c54 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java
@@ -6,6 +6,7 @@ import com.dsic.gj_erp.bean.jhgk.DmXbjh;
import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
@@ -22,7 +23,7 @@ public interface DmZrcjhService extends IService {
List upload(MultipartFile file) throws IOException;
- void save(List dmZrcjhs);
+ void save(HttpServletRequest req, List dmZrcjhs);
void tj(List dmZrcjhs);
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java
index 78dc6f3..71ee12d 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java
@@ -13,12 +13,16 @@ import com.dsic.gj_erp.util.ExcelUtil;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.modelmapper.ModelMapper;
+import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -48,8 +52,7 @@ public class DmJtsyjhServiceImpl extends ServiceImpl i
String time=json.getString("jhrq");
String startTime=time.split("~")[0];
String endTime=time.split("~")[1];
- queryWrapper.gt("jhrq",startTime);
- queryWrapper.lt("jhrq",endTime);
+ queryWrapper.between("jhrq",startTime,endTime);
}
if(StringUtils.isNotEmpty(json.getString("Zt"))){
queryWrapper.eq("zt",json.getString("Zt"));
@@ -74,7 +77,16 @@ public class DmJtsyjhServiceImpl extends ServiceImpl i
}
@Override
- public void save(List dmJtsyjhs) {
+ public void save(HttpServletRequest request, List dmJtsyjhs) {
+ String yhdm = (String) request.getAttribute("yhdm");
+ Date date=new Date();
+
+ SimpleDateFormat sdf= new SimpleDateFormat("yyyy/MM/dd");
+ String day=sdf.format(date);
+ dmJtsyjhs.forEach(dmJtsyjh -> {
+ dmJtsyjh.setBzrq(day);
+ dmJtsyjh.setBzy(yhdm);
+ });
saveBatch(dmJtsyjhs);
List> lists = Lists.partition(dmJtsyjhs, 300);
for (List list:lists) {
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java
index 5ab73cc..ea97a09 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java
@@ -49,8 +49,7 @@ public class DmXbjhServiceImpl extends ServiceImpl impleme
String nf=json.getString("nf");
String startTime=nf.split("~")[0];
String endTime=nf.split("~")[1];
- queryWrapper.gt("nf",startTime);
- queryWrapper.lt("nf",endTime);
+ queryWrapper.between("nf",startTime,endTime);
}
List dmTzjhs=dmXbjhMapper.selectList(queryWrapper);
Map> map=dmTzjhs.stream().collect(Collectors.groupingBy(DmXbjh::getDcCh));
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java
index 371ca04..7a15abc 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java
@@ -1,6 +1,7 @@
package com.dsic.gj_erp.service.jhgk.impl;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.poi.excel.ExcelReader;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,8 +19,11 @@ import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -48,8 +52,7 @@ public class DmZrcjhServiceImpl extends ServiceImpl impl
String time=json.getString("gjks");
String startTime=time.split("~")[0];
String endTime=time.split("~")[1];
- queryWrapper.gt("gjks",startTime);
- queryWrapper.lt("gjks",endTime);
+ queryWrapper.between("gjks",startTime,endTime);
}
if(StringUtils.isNotEmpty(json.getString("Zt"))){
queryWrapper.eq("zt",json.getString("Zt"));
@@ -70,10 +73,56 @@ public class DmZrcjhServiceImpl extends ServiceImpl impl
}
@Override
- public void save(List dmZrcjhs) {
- saveBatch(dmZrcjhs);
+ public void save(HttpServletRequest req,List dmZrcjhs) {
+ String bzr= (String) req.getAttribute("yhms");
+ Date date=new Date();
- List> lists = Lists.partition(dmZrcjhs, 300);
+ List saveDmzrcjhList=new ArrayList<>();
+ SimpleDateFormat sdf= new SimpleDateFormat("yyyy/MM/dd");
+ String day=sdf.format(date);
+ dmZrcjhs.forEach(dmZrcjh -> {
+ QueryWrapper queryWrapper=new QueryWrapper<>();
+ queryWrapper.eq("DC_CH",dmZrcjh.getDcCh());
+ queryWrapper.eq("DC_PL",dmZrcjh.getDcPl());
+ queryWrapper.eq("DC_FD",dmZrcjh.getDcFd());
+ DmZrcjh dmZrcjhOne=dmZrcjhMapper.selectOne(queryWrapper);
+ if (ObjectUtil.isNotEmpty(dmZrcjhOne)){
+ String dmZrcjhOneBzr=dmZrcjhOne.getBzr();
+ String dmZrcjhOneBzrq=dmZrcjhOne.getBzrq();
+ if (dmZrcjhOneBzr.contains(bzr)){
+ String[] bzrStr=dmZrcjhOneBzr.split("@");
+ String[] bzrqStr=dmZrcjhOneBzrq.split("@");
+ boolean append=false;
+ for (int i=0;i> lists = Lists.partition(saveDmzrcjhList, 300);
for (List list:lists) {
dmZrcjhMapper.updateCzplpNEW(list);
}
diff --git a/src/main/java/com/dsic/gj_erp/service/sy/SYService.java b/src/main/java/com/dsic/gj_erp/service/sy/SYService.java
index e4d38bc..86acb0f 100644
--- a/src/main/java/com/dsic/gj_erp/service/sy/SYService.java
+++ b/src/main/java/com/dsic/gj_erp/service/sy/SYService.java
@@ -418,7 +418,7 @@ public class SYService {
if (bmlb.equals("bmbm")){
dmZhbmp=dm_zhbmpRepository.findbmbm();
}
- else if(bmlb.equals("qgkw")){
+ else if(bmlb.equals("QGKW")){
dmZhbmp=dm_zhbmpRepository.findqgkw();
}
else {
diff --git a/src/main/resources/mappers/jhgk/DmZrcjhMapper.xml b/src/main/resources/mappers/jhgk/DmZrcjhMapper.xml
index b5945ca..5b306a3 100644
--- a/src/main/resources/mappers/jhgk/DmZrcjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmZrcjhMapper.xml
@@ -37,6 +37,8 @@
+
+