修正

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

@@ -107,7 +107,7 @@ public class ZyjhController {
             }else {
                 zyjhService.update(Wrappers.<DmYdjh>lambdaUpdate()
                         .set(DmYdjh::getPwfkrq,date).set(DmYdjh::getPwfkry,yhdm)
-                        .set(DmYdjh::getZt,"32")
+                        .set(DmYdjh::getZt,"42")
                         .set(DmYdjh::getLldw,dwId).set(DmYdjh::getLlcs,item.getLlcs())
                         .eq(DmYdjh::getDcCh, item.getDcCh())
                         .eq(DmYdjh::getDcPl, item.getDcPl())
@@ -387,6 +387,8 @@ public class ZyjhController {
             .eq(StrUtil.isNotEmpty(search.getField()),search.getField(),search.getUser())
             .eq(StrUtil.isNotEmpty(search.getZt()),"zt",search.getZt()).or(StrUtil.isNotEmpty(search.getZtHx()),it->it.eq("zt",search.getZtHx()))
             .eq(StrUtil.isNotEmpty(search.getDcch()),"dc_ch",search.getDcch())
+            .eq(StrUtil.isNotEmpty(search.getDcpl()),"dc_pl",search.getDcpl())
+            .eq(StrUtil.isNotEmpty(search.getZyq1()),"zyq1",search.getZyq1())
             .le(StrUtil.isNotEmpty(search.getJhrqField()),search.getJhrqField(), DateUtil.date().toString("yyyy/MM/dd"))
             //跟踪查询
             .eq(StrUtil.isNotEmpty(search.getXqrq()),"xqrq",search.getXqrq())

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

@@ -14,6 +14,8 @@ public class PgdSearch {
     private String user;
     private String jhrqField;
     private String dcch;
+    private String dcpl;
+    private String zyq1;
 
     //跟踪查询条件
     private String xqrq;

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

@@ -947,7 +947,25 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
 
 
     <update id="xzylbs"   parameterType="string" >
-        UPDATE dm_ydjh set dm_ydjh.ylbs=dm_bchxylp.sfyl from  dm_ydjh  LEFT JOIN  dm_bchxylp  ON  dm_ydjh.dc_ch=dm_bchxylp.dc_ch  AND   dm_ydjh.dc_pl=dm_bchxylp.dc_pl  AND
+        UPDATE dm_ydjh set dm_ydjh.ylbs=dm_bchxylp.sfyl,
+            dm_ydjh.zyq=	(CASE substring(RTRIM(dm_ydjh.tzbh),6,1)
+	WHEN '1' THEN 'FP2Q'
+	WHEN '3' THEN 'FP2Q'
+  WHEN '2' THEN 'FP3Q'
+  WHEN '4' THEN 'FP4Q'
+  WHEN '5' THEN 'FP4Q'
+  WHEN '6' THEN 'FP4Q'
+	ELSE ''
+END),           dm_ydjh.zyq1=	(CASE substring(RTRIM(dm_ydjh.tzbh),6,1)
+                                                 WHEN '1' THEN '二区'
+                                                 WHEN '3' THEN '二区'
+                                                 WHEN '2' THEN '三区'
+                                                 WHEN '4' THEN '四区'
+                                                 WHEN '5' THEN '四区'
+                                                 WHEN '6' THEN '四区'
+                                                 ELSE ''
+                END)
+                       from  dm_ydjh  LEFT JOIN  dm_bchxylp  ON  dm_ydjh.dc_ch=dm_bchxylp.dc_ch  AND   dm_ydjh.dc_pl=dm_bchxylp.dc_pl  AND
          dm_ydjh.tzbh=dm_bchxylp.tzbh  AND dm_ydjh.wpgg=dm_bchxylp.wpgg   and  dm_ydjh.wpxh=dm_bchxylp.wpxh   where   isnull(dm_ydjh.ylbs,'')=''
 and dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
     </update>