给相关信息提供接口 用来提供侦查指令的状态

src/main/java/com/founder/model/TbYwZczlFp.java

@@ -60,6 +60,8 @@ public class TbYwZczlFp extends BaseModel{
 
     private String sfhb = null;//是否回报0，1
 
+    private String hbsj = null;//回报时间
+
     private String sfhbpj = null;//是否评价 0，1
 
     public String getZczlbh() {
@@ -294,4 +296,12 @@ public class TbYwZczlFp extends BaseModel{
     public void setSfcqqs(String sfcqqs) {
         this.sfcqqs = sfcqqs;
     }
+
+    public String getHbsj() {
+        return hbsj;
+    }
+
+    public void setHbsj(String hbsj) {
+        this.hbsj = hbsj;
+    }
 }

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

@@ -3463,6 +3463,51 @@ public class ZczlController {
         return flag;
     }
 
+    /**
+     * 侦察指令状态
+     * @return
+     */
+    @RequestMapping("/getZlztByXgxxXxzjbh")
+    @ResponseBody
+    public Map getZlztByXgxxXxzjbh(String xgxxXxzjbh){
+        TbYwZczl tbYwZczl = zczlService.getZlztByXgxxXxzjbh(xgxxXxzjbh);
+        Map resultMap = new HashMap();
+        if(tbYwZczl != null){
+            resultMap.put("TbYwZczl",tbYwZczl);
+           if(tbYwZczl.getSpsftg() !=null &&"0".equals(tbYwZczl.getSpsftg())){//审批不通过
+               resultMap.put("zlspzt","0");
+               resultMap.put("zlztZs","未通过");
+           }else if(tbYwZczl.getSpsftg() !=null &&"2".equals(tbYwZczl.getSpsftg())){//待审批
+               resultMap.put("zlspzt","2");
+               resultMap.put("zlztZs","待审批");
+           }else if(tbYwZczl.getSpsftg() !=null &&"1".equals(tbYwZczl.getSpsftg())){//已通过
+               resultMap.put("zlspzt","1");
+               resultMap.put("zlztZs","已通过");
+               List<TbYwZczlFp> tbYwZczlFps = zczlService.getWfpdFpxx(tbYwZczl.getZczlbh(),tbYwZczl.getZlfqrgmsfhm());
+               if(tbYwZczlFps !=null && tbYwZczlFps.size() >0){
+                    for(int i =0 ;i<tbYwZczlFps.size();i++){
+                        if("1".equals(tbYwZczlFps.get(i).getSfqspdbz())){//指令已签收
+                            List<TbYwZczlHb> tbYwZczlHbs = zczlService.getAllHbxxByFpbh(tbYwZczlFps.get(i).getFpbh());
+                            if(tbYwZczlHbs != null && tbYwZczlHbs.size()>0){ //回报表中有数据
+                                tbYwZczlFps.get(i).setSfhb("1");//已回报
+                                tbYwZczlFps.get(i).setHbsj((tbYwZczlHbs.get(0).getHbsj()));
+                            }else{
+                                tbYwZczlFps.get(i).setSfhb("0");//未回报
+                            }
+                        }
+                        resultMap.put("zlfpXx",tbYwZczlFps);
+                    }
+               }
+           }else{
+               resultMap.put("zlspzt","3");
+               resultMap.put("zlztZs","已存在待提交");
+           }
+        }else{
+            resultMap.put("zlspzt","-1");
+            resultMap.put("zlztZs","该信息已不存在");
+        }
+        return resultMap;
+    }
 }
 
 

src/main/java/com/founder/zczl/dao/ZczlDao.java

@@ -172,4 +172,6 @@ public interface ZczlDao {
     List<String> queryAllUserIdByYwlx(String startId);
 
     int doQueryZt(String xxzjbh);
+
+    TbYwZczl getZlztByXgxxXxzjbh(String xgxxXxzjbh);
 }

src/main/java/com/founder/zczl/service/IZczlService.java

@@ -156,4 +156,6 @@ public interface IZczlService {
     String doLlyQxfp(TbYwZczlLly tbYwZczlLly);
 
     String doQueryZt(String xxzjbh);
+
+    TbYwZczl getZlztByXgxxXxzjbh(String xgxxXxzjbh);
 }

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

@@ -2021,5 +2021,10 @@ public class ZczlService implements IZczlService {
         }
     }
 
+    @Override
+    public TbYwZczl getZlztByXgxxXxzjbh(String xgxxXxzjbh) {
+        return zczlDao.getZlztByXgxxXxzjbh(xgxxXxzjbh);
+    }
+
     //审批权限查询与设置--end
 }

src/main/resources/application-pro.properties

-spring.datasource.url=jdbc:oracle:thin:@192.168.0.102:1521:XZXT
+spring.datasource.url=jdbc:oracle:thin:@192.168.0.103:1521:XZXT
 spring.datasource.username=XZXT
 spring.datasource.password=XZXT
 spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
@@ -9,7 +9,7 @@ logging.level.org.spring.springboot.dao=debug
 
 #redis config
 #\u65B0\u7586
-spring.redis.host=192.168.0.102
+spring.redis.host=192.168.0.103
 #\u5185\u8499
 #redis.host=10.100.17.124
 spring.redis.port=6379
@@ -23,6 +23,7 @@ domain=.xzxt.nm
 zhyyPath=http://zhyy.xzxt.nm:7001
 ssdw=430000000000
 zczlUrl=http://localhost:9022
-asjZbUrl = http://192.168.0.106:9100
+asjZbUrl = http://192.168.0.100:9100
 asjCbUrl = http://localhost:9013
-zcptUrl = http://192.168.0.108
+zcptUrl = http://192.168.0.108:9100
\ No newline at end of file
+ztptUrl = http://192.168.0.108:9100
\ No newline at end of file

src/main/resources/mapper/ZczlMapper.xml

@@ -2039,4 +2039,66 @@
         where XGXX_XXZJBH = #{xxjzbh} and XXSCPDBZ = 0
     </select>
 
+
+    <!-- 通过侦查指令编号拿到侦查指令信息 -->
+    <select id="getZlztByXgxxXxzjbh" parameterType="java.lang.String" resultType="com.founder.model.TbYwZczl">
+        select
+        zczl.ZCZLBH	zczlbh,
+        zczl.ZLWH	zlwh,
+        zczl.DJSJ	djsj,
+        to_char(zczl.DJSJ,'yyyy-MM-dd hh24:mi:ss') as djsj_str,
+        to_char(zczl.FBSJ,'yyyy-MM-dd hh24:mi:ss') as fbsj,
+        zczl.YWBH	ywbh,
+        zczl.ZLLX	zllx,
+        (select name from sys_dictitem where groupid='CODE_ZLLXDM' and code=zczl.ZLLX) as zllx_str,
+        to_char(zczl.HBQX,'yyyy-MM-dd') as hbqx,
+        zczl.HBQX hbqx_date,
+        zczl.YWMC	ywmc,
+        zczl.ZLSY	zlsy,
+        zczl.ZLFQRXM	zlfqrxm,
+        zczl.ZLFQRLXDH	zlfqrlxdh,
+        zczl.ZLFQRGAJGDM	zlfqrgajgdm,
+        zczl.SPSFTG	spsftg,
+        zczl.SPRXM	sprxm,
+        zczl.SPSJ	spsj,
+        to_char(zczl.SPSJ,'yyyy-MM-dd hh24:mi:ss') as spsj_str,
+        zczl.SPDWDM	spdwdm,
+        zczl.SPDWMC	spdwmc,
+        zczl.ZLFQRDWMC	zlfqrdwmc,
+        zczl.SPRLXDH	sprlxdh,
+        zczl.SPRGMSFHM	sprgmsfhm,
+        zczl.ZLFQRGMSFHM	zlfqrgmsfhm,
+        zczl.GZYQ	gzyq,
+        zczl.ZLJSDWDM	zljsdwdm,
+        zczl.ZLZT	zlzt,
+        zczl.YWLX	ywlx,
+        (select name from sys_dictitem where groupid='CODE_YWLXDM' and code=zczl.YWLX) as ywlx_str,
+        <!-- zczl.DZWJNR	dzwjnr,
+         zczl.DZWJMC	dzwjmc, -->
+        zczl.SFCQWHBBTS	sfcqwhbbts,
+        zczl.CQWHBTSNR	cqwhbtsnr,
+        zczl.SFTSCL	sftscl,
+        zczl.TSCLYJ	tsclyj,
+        zczl.TSSJ	tssj,
+        zczl.TSCLSJ	tsclsj,
+        zczl.TSCLRXM	tsclrxm,
+        zczl.TSCLRLXDH	tsclrlxdh,
+        zczl.TSCLRSFZHM	tsclrsfzhm,
+        zczl.TSCLRDWDM	tsclrdwdm,
+        zczl.TSCLRDWMC	tsclrdwmc,
+        zczl.XXSCPDBZ	xxscpdbz,
+        <!-- zczl.DZWJWZ	dzwjwz,  -->
+        zczl.FQRJH	fqrjh,
+        zczl.SPYJ	spyj,
+        zczl.QQFQRXM	qqfqrxm,
+        zczl.QQFQRLXDH	qqfqrlxdh,
+        zczl.QQFQRGAJGDM	qqfqrgajgdm,
+        (select name from sys_dictitem where groupid='CODE_UNIT' and code=zczl.qqfqrgajgdm) as qqfqrdwmc,
+        zczl.QQRJH	qqrjh,
+        zczl.SFQQZL	sfqqzl,
+        zczl.ZDSPRJH zdsprjh,
+        zczl.XGXX_XXZJBH xgxxXxzjbh,
+        zczl.QQFQRGMSFHM	qqfqrgmsfhm
+        from TB_YW_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0' and zczl.xgxx_xxzjbh=#{xgxxXxzjbh}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -480,7 +480,6 @@
                     $(".DNA_TITLE").find("td").eq(0).text("线索转递函编号：");
                 }else if(zllx == "6002"){
                     $(".DNA_TITLE").show();
-                    $(".ZTRY").show();
                     $(".DNA_TITLE").find("td").eq(0).text("在逃线索编号：");
                 }else if(ywlx == "0"){
                     $(".DNA_TITLE").find("td").eq(0).text("跨区域系列案件编号：");
@@ -740,6 +739,54 @@
                 layer.alert("工作要求必填！","提示");
                 return;
             }
+            //判断指令是否重复下达
+            if($("#xgxxXxzjbh").val() != null && $("#xgxxXxzjbh").val() != "") {
+                $.ajax({
+                    url: "/doQueryZt",
+                    data: {"xxzjbh": $("#xgxxXxzjbh").val()},
+                    type: "POST",
+                    success: function (data) {
+                        if (data == "1") {
+                            layer.alert("该编号（" + $("#xgxxXxzjbh").val() + "）已经下达过侦查指令，请勿重复下达！", "提示");
+                            return;
+                        } else {
+//判断单位是否存在联络员
+                            $.ajax({
+                                url:'/queryLlys?unitcodes='+zljsdwdm+"&ywlx="+ywlx,
+                                type:"post",
+                                success:function (data) {
+                                    layer.close(index);
+                                    debugger
+                                    if(data=='1'){
+                                        //存在联络员
+                                        var index = layer.load(1, {
+                                            content: '数据加载中...',
+                                            shade: [0.35,'#fff'],
+                                            success: function(layero) {
+                                                /*layero.css('padding-left', '30px');*/
+                                                layero.find('.layui-layer-content').css({
+                                                    'padding-top': '40px',
+                                                    'width': '70px',
+                                                    'background-position-x': '16px'
+                                                });
+                                            }
+                                        });
+                                        document.zczlForm.action = "/doAddZczlxx?flag="+flag+"&sfqqzl=1";
+                                        document.zczlForm.submit();
+                                    }else{
+                                        //操作失败-存在单位没有联络员
+                                        layer.alert(data+"不存在联络员，不能进行指令下发！","提示",function(res){
+                                            if(res){
+                                                layer.closeAll();
+                                            }
+                                        });
+                                    }
+                                }
+                            });
+                        }
+                    }
+                })
+            }else{
                 //判断单位是否存在联络员
                 $.ajax({
                     url:'/queryLlys?unitcodes='+zljsdwdm+"&ywlx="+ywlx,
@@ -773,6 +820,8 @@
                         }
                     }
                 });
+            }
+
 
 
 

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

@@ -829,7 +829,7 @@
                 return;
             }
             //判断指令是否重复下达
-            if($("#xgxxXxzjbh").val() != "" && $("#xgxxXxzjbh").val() != null){
+            if($("#xgxxXxzjbh").val() != null && $("#xgxxXxzjbh").val() != ""){
                 $.ajax({
                     url:"/doQueryZt",
                     data:{"xxzjbh":$("#xgxxXxzjbh").val()},