()
- .ge(StrUtil.isNotEmpty(map.get("beginTime")), "xzglxq", map.get("beginTime"))
- .le(StrUtil.isNotEmpty(map.get("endTime")), "xzglxq", map.get("endTime"))
+ .ge(StrUtil.isNotEmpty(map.get("beginTime")), "xzglxq", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("beginTime"))))
+ .le(StrUtil.isNotEmpty(map.get("endTime")), "xzglxq", DateUtil.endOfMonth(DateUtil.parseDate(map.get("endTime"))))
.orderByAsc("dc_ch, cast(dc_pl as int),xzglxq"));
if (ObjUtil.isEmpty(list)) {
return new ResultBean();
@@ -100,24 +101,7 @@ public class DmSygdxqController {
return new ResultBean();
}
- public static void main(String[] agrs) {
-// String a = "2023/08/20";
-// String b = "2023/08/21";
-// System.out.println(a.compareTo(b));
-// System.out.println(DateUtil.format(DateUtil.nextMonth(),"yyyy/MM"));
-// String[] a={"船只", "批量号", "总段号", "分段号", "大组极重", "总装部最新分段需求期", "钢料需求", "X大板", "X数控件", "X平铁", "X压弯", "X型材", "X二次装T型材"};
-// String[] b={"月份","跨位","船号","批量","分段","板数","订货清单号","到货数量","订货数量","备料总工时","抛丸总工时","理料总工时","划线总工时","切割总工时","坡口总工时","打磨总工时","曲加工总工时"};
-// String[] a1={"dcCh","dcPl", "zdh","dcFd","dzjz","zxfdxq", "glxq", "xdb", "xskj,",
-// "xpt,", "xyw", "xxc", "xtxc", };
-// String[] b1={"yf","kw","ch","pl","fd","bs","dhqd","dhsl","dhsl","blgs","pwgs","llgs","hxgs","qggs","pkgs","dmgs","qjggs"};
-// for (int i = 0; i < b.length; i++) {
-// System.out.println("{ field: '"+b1[i]+"', title: '"+b[i]+"', width: 120, \n" +
-// " filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],\n" +
-// " filterRender: { name: 'FilterCombination', },\n" +
-// "},");
-// }
-// System.out.println("2023/08/05".substring(0,7));
- }
+
}
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
index e4e24af..34da123 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
@@ -1,11 +1,11 @@
package com.dsic.gj_erp.controller.jhgk;
+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.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.service.jhgk.DmYdjhService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
+import java.util.Map;
/**
*
@@ -32,12 +33,11 @@ public class DmYdjhController {
@RequestMapping("/getList")
@AuthFunction
- public ResultBean getList(@RequestBody DmSygdMx sygd){
+ public ResultBean getList(@RequestBody Map map){
List list= service.list(new QueryWrapper()
- .eq(StrUtil.isNotEmpty(sygd.getDcCh()),"dc_ch",sygd.getDcCh())
- .eq(StrUtil.isNotEmpty(sygd.getDcPl()),"dc_pl",sygd.getDcPl())
- .ge(StrUtil.isNotEmpty(sygd.getBeginTime()),"jssj",sygd.getBeginTime())
- .le(StrUtil.isNotEmpty(sygd.getEndTime()),"jssj",sygd.getEndTime())
+ .eq(StrUtil.isNotEmpty(map.get("dcCh")),"dc_ch",map.get("dcCh"))
+ .ge(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("yf"))))
+ .le(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf"))))
.orderByAsc("jssj,dc_ch,dc_pl")
);
return new ResultBean(list);
@@ -46,8 +46,13 @@ public class DmYdjhController {
@RequestMapping("/tjydjh")
@AuthFunction
public ResultBean tjydjh(){
-
return new ResultBean(service.tjydjh());
}
+
+ @RequestMapping("/hz")
+ @AuthFunction
+ public ResultBean hz(@RequestBody List list){
+ return new ResultBean(service.hz(list));
+ }
}
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhLjController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhLjController.java
new file mode 100644
index 0000000..db48885
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhLjController.java
@@ -0,0 +1,20 @@
+package com.dsic.gj_erp.controller.jhgk;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xn
+ * @since 2023-12-15
+ */
+@RestController
+@RequestMapping("/dmYdjhLj")
+public class DmYdjhLjController {
+
+}
+
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmQfxqMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmQfxqMapper.java
index 68f0fa3..07c1e8f 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmQfxqMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmQfxqMapper.java
@@ -3,6 +3,9 @@ package com.dsic.gj_erp.mapper.jhgk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsic.gj_erp.bean.jhgk.DmQfxq;
+import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+
+import java.util.List;
/**
*
@@ -14,4 +17,5 @@ import com.dsic.gj_erp.bean.jhgk.DmQfxq;
*/
public interface DmQfxqMapper extends BaseMapper {
+ List getYdjh(List ids);
}
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java
index 2f56e81..20dcf1c 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java
@@ -24,11 +24,12 @@ public interface DmSygdMxMapper extends BaseMapper {
Dhdto getDhsl(Dhdto dhdto);
- List getLjxx();
- List getMx();
- int setParent();
+ List getLjxx(@Param("begin") String begin, @Param("end") String end);
+ List getMx(@Param("begin") String begin, @Param("end") String end);
+ int setParent(@Param("begin") String begin, @Param("end") String end);
List getkw(@Param("begin") String begin, @Param("end") String end);
List getPl(@Param("begin") String begin,@Param("end") String end);
+ List updateQgjssj( List ljList);
List