年度-考核评价

qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfJcdwkhpjController.java

@@ -194,7 +194,7 @@ public class SjZdbfJcdwkhpjController extends BaseController
             sjZdbfZsdwfjxcj.setDeptId(deptId);
             sjZdbfZsdwfjxcj.setStartRq(startRq);
             sjZdbfZsdwfjxcj.setEndRq(endRq);
-            sjZdbfZsdwfjxcj.setYl1("基层单位自查");
+          /*  sjZdbfZsdwfjxcj.setYl1("基层单位自查");*/
             List<SjZdbfZsdwfjxcj> sjZdbfZsdwfjxcjs = sjZdbfZsdwfjxcjMapper.selectSjZdbfZsdwfjxcjList(sjZdbfZsdwfjxcj);
             for(int i=0;i<cbList.size();i++){
                 SjZdbfFjxbzCb cb = cbList.get(i);
@@ -209,7 +209,7 @@ public class SjZdbfJcdwkhpjController extends BaseController
                 fjx.setJb("基层单位");
                 fjx.setZbId(sjZdbfZsdwkhpjZbnew.getId());
                 fjx.setYl1(i+1L);
-                List<String> collect = sjZdbfZsdwfjxcjs.stream().filter(item -> item.getPjbzid().equals(cb.getId())).map(SjZdbfZsdwfjxcj::getWtmc).collect(Collectors.toList());
+                List<String> collect = sjZdbfZsdwfjxcjs.stream().filter(item -> item.getPjbzid().equals(cb.getId()+"")).map(SjZdbfZsdwfjxcj::getWtmc).collect(Collectors.toList());
                 if(collect.size()>0){
                     fjx.setSffs("是");
                     fjx.setWtms(String.join(";",collect));

qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfZsdwkhpjController.java

@@ -217,7 +217,7 @@ public class SjZdbfZsdwkhpjController extends BaseController
                 fjx.setJb("直属单位");
                 fjx.setZbId(sjZdbfZsdwkhpjZbnew.getId());
                 fjx.setYl1(i+1L);
-                List<String> collect = sjZdbfZsdwfjxcjs.stream().filter(item -> item.getPjbzid().equals(cb.getId())).map(SjZdbfZsdwfjxcj::getWtmc).collect(Collectors.toList());
+                List<String> collect = sjZdbfZsdwfjxcjs.stream().filter(item -> item.getPjbzid().equals(cb.getId()+"")).map(SjZdbfZsdwfjxcj::getWtmc).collect(Collectors.toList());
                 if(collect.size()>0){
                     fjx.setSffs("是");
                     fjx.setWtms(String.join(";",collect));

qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfndkhpjController.java

@@ -184,9 +184,9 @@ public class SjZdbfndkhpjController extends BaseController
             //查询否决
             SjZdbfZsdwfjxcj sjZdbfZsdwfjxcj=new SjZdbfZsdwfjxcj();
             sjZdbfZsdwfjxcj.setDeptId(deptId);
-            sjZdbfZsdwfjxcj.setStartRq(nd);
-            sjZdbfZsdwfjxcj.setEndRq(nd);
-            sjZdbfZsdwfjxcj.setYl1("年度自查");
+            sjZdbfZsdwfjxcj.setStartRq(startRq);
+            sjZdbfZsdwfjxcj.setEndRq(endRq);
+           /* sjZdbfZsdwfjxcj.setYl1("年度自查");*/
             List<SjZdbfZsdwfjxcj> sjZdbfZsdwfjxcjs = sjZdbfZsdwfjxcjMapper.selectSjZdbfZsdwfjxcjList(sjZdbfZsdwfjxcj);
             for(int i=0;i<cbList.size();i++){
                 SjZdbfFjxbzCb cb = cbList.get(i);
@@ -201,7 +201,7 @@ public class SjZdbfndkhpjController extends BaseController
                 fjx.setJb("年度");
                 fjx.setZbId(sjZdbfZsdwkhpjZbnew.getId());
                 fjx.setYl1(i+1L);
-                List<String> collect = sjZdbfZsdwfjxcjs.stream().filter(item -> item.getPjbzid().equals(cb.getId())).map(SjZdbfZsdwfjxcj::getWtmc).collect(Collectors.toList());
+                List<String> collect = sjZdbfZsdwfjxcjs.stream().filter(item -> item.getPjbzid().equals(cb.getId()+"")).map(SjZdbfZsdwfjxcj::getWtmc).collect(Collectors.toList());
                 if(collect.size()>0){
                     fjx.setSffs("是");
                     fjx.setWtms(String.join(";",collect));