diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java index 7a20a03..8b26c66 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdDmjh; import com.dsic.gj_erp.bean.pgd.PgdDmjh; import com.dsic.gj_erp.exception.CustomException; @@ -52,7 +53,7 @@ public class PgdDmjhController { @PostMapping("/saveDmPgdXd") @ResponseBody @AuthFunction - public ResultBean saveDmPgdXd(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + public ResultBean saveDmPgdXd(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { pgdDmjhService.saveDmPgdXd(list,req); return new ResultBean(); } @@ -60,7 +61,7 @@ public class PgdDmjhController { @PostMapping("/saveDmPgdXdBack") @ResponseBody @AuthFunction - public ResultBean saveDmPgdXdBack(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + public ResultBean saveDmPgdXdBack(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { pgdDmjhService.saveDmPgdXdBack(list,req); return new ResultBean(); } @@ -70,14 +71,14 @@ public class PgdDmjhController { @PostMapping("/saveDmPgdFk") @ResponseBody @AuthFunction - public ResultBean saveDmPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + public ResultBean saveDmPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { pgdDmjhService.saveDmPgdFk(list,req); return new ResultBean(); } @PostMapping("/saveDmFk") @ResponseBody @AuthFunction - public ResultBean saveDmFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + public ResultBean saveDmFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { pgdDmjhService.saveDmFk(list,req); return new ResultBean(); } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java index 6da0667..d5d8420 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java @@ -19,10 +19,10 @@ import java.util.List; */ public interface PgdDmjhService extends IService { - void saveDmPgdXd(List dmjhs, HttpServletRequest request); - void saveDmPgdFk(List dmjhs, HttpServletRequest request); - void saveDmPgdXdBack(List dmjhs, HttpServletRequest request); - void saveDmFk(List dmjhs, HttpServletRequest request); + void saveDmPgdXd(List dmjhs, HttpServletRequest request); + void saveDmPgdFk(List dmjhs, HttpServletRequest request); + void saveDmPgdXdBack(List dmjhs, HttpServletRequest request); + void saveDmFk(List dmjhs, HttpServletRequest request); diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java index 154d228..5e74687 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java @@ -1,13 +1,16 @@ package com.dsic.gj_erp.service.pgd.impl; import cn.hutool.core.date.DateUtil; +import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdDmjh; import com.dsic.gj_erp.bean.pgd.PgdPkjh; import com.dsic.gj_erp.bean.pgd.PgdPwjh; import com.dsic.gj_erp.bean.pgd.PgdQgjh; import com.dsic.gj_erp.mapper.pgd.PgdDmjhMapper; +import com.dsic.gj_erp.service.jhgk.DmYdjhLjService; import com.dsic.gj_erp.service.pgd.PgdDmjhService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -24,54 +27,58 @@ import java.util.List; */ @Service public class PgdDmjhServiceImpl extends ServiceImpl implements PgdDmjhService { + @Autowired + DmYdjhLjService dmYdjhLjService; + + @Override - public void saveDmPgdXd(List dmjhs, HttpServletRequest request) { - Listups= new ArrayList<>(); + public void saveDmPgdXd(List dmjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); dmjhs.forEach(f->{ - PgdDmjh e= new PgdDmjh(); - e.setXfry((String) request.getAttribute("yhms")); - e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); - e.setZt("02"); + DmYdjhLj e= new DmYdjhLj(); + e.setDmXfry((String) request.getAttribute("yhms")); + e.setDmXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setDmZt("02"); e.setId(f.getId()); ups.add(e); }); - this.updateBatchById(ups); + dmYdjhLjService.updateBatchById(ups); } @Override - public void saveDmPgdFk(List dmjhs, HttpServletRequest request) { - Listups= new ArrayList<>(); + public void saveDmPgdFk(List dmjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); dmjhs.forEach(f->{ - PgdDmjh e= new PgdDmjh(); - e.setFkry((String) request.getAttribute("yhms")); - e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); - e.setZt("09"); - e.setFkyy(f.getFkyy()); + DmYdjhLj e= new DmYdjhLj(); + e.setDmFkry((String) request.getAttribute("yhms")); + e.setDmFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setDmZt("09"); + e.setDmFkyy(f.getDmFkyy()); e.setId(f.getId()); ups.add(e); }); - this.updateBatchById(ups); + dmYdjhLjService.updateBatchById(ups); } @Override - public void saveDmPgdXdBack(List dmjhs, HttpServletRequest request) { + public void saveDmPgdXdBack(List dmjhs, HttpServletRequest request) { - Listups= new ArrayList<>(); + Listups= new ArrayList<>(); dmjhs.forEach(f->{ - PgdDmjh e= new PgdDmjh(); - e.setXfry((String) request.getAttribute("yhms")); - e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); - if(f.getZt().equals("02")){ - e.setZt("01"); + DmYdjhLj e= new DmYdjhLj(); + e.setDmXfry((String) request.getAttribute("yhms")); + e.setDmXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + if(f.getDmZt().equals("02")){ + e.setDmZt("01"); } e.setId(f.getId()); ups.add(e); }); - this.updateBatchById(ups); + dmYdjhLjService.updateBatchById(ups); } @Override - public void saveDmFk(List dmjhs, HttpServletRequest request) { + public void saveDmFk(List dmjhs, HttpServletRequest request) { Listups= new ArrayList<>(); dmjhs.forEach(f->{ PgdDmjh e= new PgdDmjh();