Merge remote-tracking branch 'origin/master'

src/main/java/com/dsic/gj_erp/controller/kban/dto.java

@@ -1,9 +0,0 @@
-package com.dsic.gj_erp.controller.kban;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class dto {
-}

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-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;
@@ -26,9 +25,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Field;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("zyjh")
@@ -216,7 +213,7 @@ public class ZyjhController {
                 .le(DmYdjh::getSljhrq, date)
                 .eq(StrUtil.isNotEmpty(search.getZt()),DmYdjh::getZt, search.getZt())
                 .eq(StrUtil.isNotEmpty(search.getDcch()),DmYdjh::getDcCh, search.getDcch())
-                .eq(StrUtil.isNotEmpty(search.getPl()),DmYdjh::getDcPl, search.getPl())
+                .eq(StrUtil.isNotEmpty(search.getDcPl()),DmYdjh::getDcPl, search.getDcPl())
                 .eq(StrUtil.isNotEmpty(search.getKw()),DmYdjh::getKw, search.getKw())
         );
         return new ResultBean<>(list);
@@ -246,7 +243,10 @@ public class ZyjhController {
         return new ResultBean<>(ycldwService.ycldwList(type));
     }
 
-
+    @GetMapping("dw")
+    public ResultBean<?> dw(String type){
+        return new ResultBean<>(ycldwService.list(Wrappers.<Ycldw>lambdaQuery().eq(Ycldw::getType,type)));
+    }
 
 
     /**

src/main/java/com/dsic/gj_erp/controller/zyjh/dto/SljhSearch.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 @Setter
 public class SljhSearch {
     private String dcch;
-    private String pl;
+    private String dcPl;
     private String kw;
     private String sljhrq;
     private String zt="2";

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java

@@ -246,7 +246,7 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
         String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd");
 
         //工单号
-        List<DmYdjh> updateList = ydjhList.stream().map(item -> {
+        List<DmYdjh> updateList = ydjhList.stream().filter(item->StrUtil.isNotEmpty(item.getSljhrq())).map(item -> {
             Long increment = redisTemplate.opsForHash().increment("ZYJH_GDH::", item.getSljhrq(), 1);
             DmYdjh dmYdjh = new DmYdjh();
             dmYdjh.setId(item.getId());

src/main/resources/mappers/jhgk/DmQfxqMapper.xml

@@ -62,7 +62,7 @@
             dm_sygd_mx.xxr,
             dm_sygd_mx.pkrq,
             dm_sygd_mx.qjgrq,
-            dm_sygd_mx.dmrq
+            dm_sygd_mx.dmrq,
             dm_qfxq.dzglxq as gjjs_dz
         from
             (SELECT * from (