添加需要我审批的指令模块中指令接收单位检索功能

src/main/java/com/founder/zczl/controller/ZczlController.java

@@ -1097,6 +1097,17 @@ public class ZczlController {
                 objectMap.put("spsftg", zczl.getSpsftg());//审批状态 0-未通过  1-通过  2-待审批
                 objectMap.put("gzyq", zczl.getGzyq());//工作要求
                 objectMap.put("zczlbh", zczl.getZczlbh());//侦查指令编号
+                String zljsdwdm = zczl.getZljsdwdm();
+                String[] arr = zljsdwdm.split(",");
+                String zljsdwdm_name = null;
+                for(int i=0;i<arr.length;i++){
+                    if(i==0){
+                        zljsdwdm_name = zczlService.getUnitnameByUnitcode(arr[i]);
+                    }else{
+                        zljsdwdm_name = zljsdwdm_name+","+zczlService.getUnitnameByUnitcode(arr[i]);
+                    }
+                }
+                objectMap.put("zljsdwdm_name", zljsdwdm_name);//指令接收单位名称
                 jeMapList.add(objectMap);
             }
         }

src/main/java/com/founder/zczl/service/impl/ZczlService.java

@@ -424,6 +424,28 @@ public class ZczlService implements IZczlService {
                 e.printStackTrace();
             }
         }
+        String zljsdwdm = tbYwZczl.getZljsdwdm();
+        if(zljsdwdm!=null&&zljsdwdm.length()>0){
+            String[] arr = zljsdwdm.split(",");
+            //拼接sql串
+            if(arr!=null){
+                if(arr.length>1){
+                    for(int i=0;i<arr.length;i++){
+                        if(i==0){
+                            zljsdwdm = "(zczl.ZLJSDWDM like '%"+arr[i]+"%'";
+                        }else if(i==arr.length-1){
+                            zljsdwdm = zljsdwdm+"or zczl.ZLJSDWDM like '%"+arr[i]+"%')";
+                        }else{
+                            zljsdwdm = zljsdwdm+"or zczl.ZLJSDWDM like '%"+arr[i]+"%'";
+                        }
+                    }
+                }else{
+                    zljsdwdm = "zczl.ZLJSDWDM like '%"+zljsdwdm+"%'";
+                }
+                tbYwZczl.setZljsdwdm(zljsdwdm);
+
+            }
+        }
         return zczlDao.toQueryXywspdzczls(tbYwZczl);
     }
 

src/main/resources/mapper/ZczlMapper.xml

@@ -610,6 +610,7 @@
         <if test="zllx!=null and zllx!=''"> and zczl.zllx =  #{zllx, jdbcType=VARCHAR}</if>
         <if test="ywlx!=null and ywlx!=''"> and zczl.ywlx =  #{ywlx, jdbcType=VARCHAR}</if>
         <if test="spsftg!=null and spsftg!=''"> and zczl.spsftg =  #{spsftg, jdbcType=VARCHAR}</if>
+        <if test="zljsdwdm!=null and zljsdwdm!=''">and ${zljsdwdm}</if>
         <if  test="fbsj_s!=null and fbsj_s!=''">and zczl.fbsj <![CDATA[>=]]> (to_date(#{fbsj_s, jdbcType=VARCHAR},'yyyy-MM-dd'))</if>
         <if  test="fbsj_e!=null and fbsj_e!=''">and zczl.fbsj<![CDATA[<=]]>(to_date(#{fbsj_e, jdbcType=VARCHAR},'yyyy-MM-dd'))</if>
         and zczl.spsftg!='3'<!-- 需要我审批的查看不到草稿状态  -->

src/main/resources/static/js/listXywspdzczl.js

@@ -199,12 +199,15 @@ function spyj(spsftg){
 }
 
 var table_title = [
-    {title:"操作",field:"cz",align:'center',width:'10%',formatter:function(val,row,index){
+    {title:"操作",field:"cz",align:'center',width:'7%',formatter:function(val,row,index){
         return getCzColumn(row);
     }},
-    {title:"指令文号",field:"zlwh",align:'center',width:'20%',formatter : function(val,row,index){
+    {title:"指令文号",field:"zlwh",align:'center',width:'12%',formatter : function(val,row,index){
         return row.zlwh ;
     }},
+    {title:"指令接收单位",field:"zljsdwdm_name",align:'center',width:'18%',formatter : function(val,row,index){
+        return  "<span style='width:100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;display: block;' title='"+row.zljsdwdm_name+"'>"+row.zljsdwdm_name+"</span>";
+    }},
     {title:"业务类型",field:"ywlx_str",align:'center',width:'10%',formatter : function(val,row,index){
         return row.ywlx_str ;
     }},
@@ -214,7 +217,9 @@ var table_title = [
     /*{title:"业务名称",field:"ywmc",align:'center',width:'10%'},*/
     {title:"回报期限",field:"hbqx",align:'center',width:'10%'},
     {title:"发布时间",field:"fbsj",align:'center',width:'10%'},
-    {title:"指令事由",field:"zlsy",align:'center',width:'20%'},
+    {title:"指令事由",field:"zlsy",align:'center',width:'15%',formatter : function(val,row,index){
+        return  "<span style='width:100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;display: block;' title='"+row.zlsy+"'>"+row.zlsy+"</span>";
+    }},
     {title:"审批状态",field:"spsftg",align:'center',width:'10%',formatter : function(val,row,index){
         return getSpztColumn(row);
     }}

src/main/resources/version.txt

@@ -39,5 +39,6 @@ version=@project.version@
 #19.解决发起指令多选时无法判断单位是否存在联络员问题 02：解决发起指令多选时无法判断单位是否存在联络员问题
 #20.添加访问超时重新登录的提示 02：添加访问超时重新登录的提示
 #21.修改我发起的指令模块中指令接收单位检索功能 01：将指令接收单位由单选更改为多选
+#22.添加需要我审批的指令模块中指令接收单位检索功能 01：添加指令接收单位的检索
 
 ————————————————————@project.version@-——————————————————————————

src/main/webapp/WEB-INF/jsp/xywspdzczl.jsp

@@ -215,6 +215,14 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td class="ar" width="13.3%">指令接收单位：</td>
+                                <td width="20%">
+                                    <span class="textbox">
+                                       <input type="text" id="zljsdwdm" name="zljsdwdm" class="val easyui-combotree" multiple data-options="url: '/queryTypeCode?type=CODE_XZUNIT',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
+                                    </span>
+                                </td>
+                            </tr>
+                            <tr>
                                 <td class="ar">指令事由：</td>
                                 <td colspan="5" class="20%">
                                     <span class="textbox">
@@ -270,6 +278,7 @@
     <script>
         openCombotree('ywlx');
         openCombotree('zllx');
+        openCombotree('zljsdwdm');
     </script>
 </body>
 <div class="mask"></div>