From f945083bfde19fb16a3f91e4db5009ab0e56a1ba Mon Sep 17 00:00:00 2001 From: xhj Date: Sun, 15 Sep 2024 11:20:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jcsj/DmBzry.java | 19 +++- .../controller/jcsj/DmBzryController.java | 87 ++++++++++++++++++- .../controller/pgd/PgdTzjhController.java | 32 ++++--- 3 files changed, 121 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzry.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzry.java index 6ad39fd..b104699 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzry.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzry.java @@ -49,8 +49,23 @@ public class DmBzry implements Serializable { @ApiModelProperty(value = "状态") private String flagStatus; - @TableId(value = "id", type = IdType.ASSIGN_UUID) - private String id; + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + + private String zyq; + private String xgry; + private String xgrq; + private String zt ; //01 白班 02 夜班 + private String yzt ; //01 白班 02 夜班 + private String rqfw ; //01 白班 02 夜班 + private String bz ; //01 白班 02 夜班 + + @TableField(exist = false) + private String zzt ; //01 白班 02 夜班 + + + } diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java index bd621fe..d78ef8a 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java @@ -1,19 +1,28 @@ package com.dsic.gj_erp.controller.jcsj; +import cn.hutool.core.date.DateUtil; +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.jcsj.DmBzry; import com.dsic.gj_erp.bean.jcsj.DmBzzz; +import com.dsic.gj_erp.bean.sy.Dm_zhbmp; +import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository; import com.dsic.gj_erp.service.jcsj.DmBzryService; import com.dsic.gj_erp.service.jcsj.DmBzzzService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -28,13 +37,85 @@ import java.util.List; public class DmBzryController { @Autowired DmBzryService service; + @Autowired + Dm_zhbmpRepository dm_zhbmpRepository; @PostMapping(value = "/getList") - public ResultBean getList(@RequestBody DmBzry t){ + public ResultBean getList(@RequestBody Map map){ List list=service.list(new QueryWrapper() - .eq("resources_code",t.getResourcesCode()) - .eq("flag_status","1")); + + .eq("flag_status","1").eq( + StrUtil.isNotEmpty((String)map.get("resourcesCode")),"resources_code",(String)map.get("resourcesCode")).eq( + StrUtil.isNotEmpty((String)map.get("zyq")),"zyq",(String)map.get("zyq") + + ).like( StrUtil.isNotEmpty((String)map.get("userName")),"user_name",(String)map.get("userName")) + ); +// list.forEach(e->{ +// e.setZzt(e.getZt()); +// }); return new ResultBean(list); } + + + @PostMapping(value = "/getBzryUpdate") + @Transactional(rollbackFor = Exception.class) + @AuthFunction + public ResultBean getBzryUpdate(@RequestBody List t, HttpServletRequest request){ + String bzry= (String) request.getAttribute("yhms"); + String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd"); + t.forEach(e->{ + e.setXgrq(bzrq); + e.setXgry(bzry); + service.updateById(e); + }); + + return new ResultBean(); + } + + + @PostMapping(value = "/getryBase") + @Transactional(rollbackFor = Exception.class) + public ResultBean getryBase(@RequestBody Map mapp, HttpServletRequest request){ + List resourcesCodes = service.list(new QueryWrapper().select("DISTINCT resources_code as resourcesCode ") + .eq("flag_status", "1").ne("isnull(resources_code,'')","").orderBy(true,true,"resources_code")); + + List zyqs = service.list(new QueryWrapper().select("DISTINCT zyq as zyq ") + .eq("flag_status", "1").ne("isnull(zyq,'')","").ne("isnull(user_name,'')","").orderBy(true,true,"zyq")); + List kwxxs = dm_zhbmpRepository.findByBMLB("PBBM"); + Map map = new HashMap<>(); + map.put("kwxxs",kwxxs); + map.put("resourcesCodes",resourcesCodes); + map.put("zyqs",zyqs); + return new ResultBean(map); + } + + @PostMapping(value = "/getBzryInsert") + @Transactional(rollbackFor = Exception.class) + @AuthFunction + public ResultBean getBzryInsert(@RequestBody List t, HttpServletRequest request){ + String bzry= (String) request.getAttribute("yhms"); + String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd"); + t.forEach(e->{ + e.setXgrq(bzrq); + e.setXgry(bzry); + e.setFlagStatus("1"); + service.save(e); + }); + + return new ResultBean(); + } + + @PostMapping(value = "/getBzryDel") + @Transactional(rollbackFor = Exception.class) + @AuthFunction + public ResultBean getBzryDel(@RequestBody List t, HttpServletRequest request){ + String bzry= (String) request.getAttribute("yhms"); + String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd"); + t.forEach(e->{ + service.removeById(e.getId()); + }); + + return new ResultBean(); + } } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java index a9637aa..aa69dc4 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java @@ -7,20 +7,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; -import com.dsic.gj_erp.bean.jcsj.DmBclqjbp; -import com.dsic.gj_erp.bean.jcsj.DmCbxxp; -import com.dsic.gj_erp.bean.jcsj.DmDwxxp; -import com.dsic.gj_erp.bean.jcsj.EmSbjgry; +import com.dsic.gj_erp.bean.jcsj.*; import com.dsic.gj_erp.bean.jhgk.DmTzjh; import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.dsic.gj_erp.bean.sy.Dm_zhbmp; import com.dsic.gj_erp.bean.zyjh.Ycldw; import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository; import com.dsic.gj_erp.exception.CustomException; -import com.dsic.gj_erp.service.jcsj.DmBclqjbpService; -import com.dsic.gj_erp.service.jcsj.DmBclqmxpService; -import com.dsic.gj_erp.service.jcsj.DmCbxxpService; -import com.dsic.gj_erp.service.jcsj.EmSbjgryService; +import com.dsic.gj_erp.service.jcsj.*; import com.dsic.gj_erp.service.jcsj.impl.DmDwxxpService; import com.dsic.gj_erp.service.pgd.PgdTzjhService; import com.dsic.gj_erp.service.sy.SYService; @@ -61,6 +55,10 @@ public class PgdTzjhController { Dm_zhbmpRepository dm_zhbmpRepository; + @Autowired + DmBzryService dmBzryService; + + @Autowired SYService syService; @@ -143,10 +141,20 @@ public class PgdTzjhController { List pwwzs = dm_zhbmpRepository.findByBMLB("pwwz"); List dhql = dm_zhbmpRepository.findByBMLB("DHQL"); -// Map qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); -// Map zylxMap = zylxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); -// Map pwwzMap = pwwzs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); -// Map dhqlMap = dhql.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + List resourcesCodes = dmBzryService.list(new QueryWrapper().select("DISTINCT resources_code as resourcesCode ") + .eq("flag_status", "1").ne("isnull(resources_code,'')","").orderBy(true,true,"resources_code")); + + + List zyqs = dmBzryService.list(new QueryWrapper().select(" resources_code","zyq") + .eq("flag_status", "1").ne("isnull(resources_code,'')","").groupBy("resources_code","zyq").orderBy(true,true,"resources_code")); + + List zyrys= dmBzryService.list(new QueryWrapper() + .eq("flag_status", "1").ne("isnull(zyq,'')","").orderBy(true,true,"zyq")); + List kwxxs = dm_zhbmpRepository.findByBMLB("PBBM"); + + returnMap.put("resourcesCodes",resourcesCodes); + returnMap.put("zyqs",zyqs); + returnMap.put("zyrys",zyrys); returnMap.put("qgkw", qgkws); returnMap.put("zylx", zylxs); returnMap.put("pwwz", pwwzs);