质量抽查：抽查方法修改、合格与不合格等判断将质量检查区分开来、抽查任务页面添加任务创建时间字段

src/main/java/com/founder/controller/ZlccController.java

@@ -374,6 +374,7 @@ public class ZlccController {
         xyrxx.setCcbh(ccbh);
         xyrxx.setfRCjsjStr(fRCjsjStr);
         xyrxx.seteRCjsjStr(eRCjsjStr);
+
         //excel标题
         String[] title = {"人员编号", "文字信息", "人像", "", "", "滚动指纹", "", "", "", "", "", "", "", "", "", "不合格枚数", "缺指枚数", "备注", "检查结果", "抽取单位", "采集数", "抽取数", "不合格份数"};
         String[] title1 = {"", "", "正面", "左侧面", "右侧面", "右拇", "右食", "右中", "右环", "右小", "左拇", "左食", "左中", "左环", "左小", "", "", "", "", "", "", "", ""};
@@ -880,6 +881,7 @@ public class ZlccController {
 
     @RequestMapping("/toZlcc")
     public String toZlcc(Model model, String rybh, String szzwbh, String ifxq, String ccbh, String rwbh, HttpServletRequest request) {
+        log.info("抽查检查时传入参数：任务编号："+rwbh+"，指纹编号："+szzwbh+"，抽查编号："+ccbh);
         AutoTbStRy xyrC = rycjService.getRyxxBySzzwbh(szzwbh);
         String zwfkxx = xyrC.getZwfkxx();
         if (zwfkxx != null && !zwfkxx.equals("")) {

src/main/java/com/founder/dao/AfisQualityCkDao.java

@@ -42,6 +42,8 @@ public interface AfisQualityCkDao extends MyMapper<AfisQualityCk> {
 
     public Integer queryZlccPageCount(Map<String, Object> map);
 
+    public Integer queryZlccjcPageCount(Map<String, Object> map);
+
     public List<AfisQualityCk> queryZlccPageList(Map<String, Object> map);
 
     public Integer queryZlccFirstPageCount(Map<String, Object> map);

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

@@ -25,12 +25,21 @@ public class AfisQualityCcrw implements Serializable {
 	private String cjdwdm;  //创建单位
 	private String cjr;     //创建人
 	private Date cjsj;      //创建时间
+	private String cjsjStr; //创建时间
 	private String bz;      //备注
 	private String rwbz;      //备注
 	private String gxdwdm;  //修改单位
 	private String gxr;     //修改人
 	private Date gxsj;      //修改时间
 
+	public String getCjsjStr() {
+		return cjsjStr;
+	}
+
+	public void setCjsjStr(String cjsjStr) {
+		this.cjsjStr = cjsjStr;
+	}
+
 	public String getCcdwStr() {
 		return ccdwStr;
 	}

src/main/java/com/founder/service/impl/AfisQualityCcrwServiceImpl.java

@@ -73,6 +73,11 @@ public class AfisQualityCcrwServiceImpl extends BaseService<AfisQualityCcrw> imp
             }
             DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             for (int i=0;i<afisQualityCks.size();i++) {
+                if(afisQualityCks.get(i).getCjsj()!=null&&!"".equals(afisQualityCks.get(i).getCjsj())){
+                    afisQualityCks.get(i).setCjsjStr(df.format(afisQualityCks.get(i).getCjsj()));
+                }else{
+                    afisQualityCks.get(i).setCjsjStr("");
+                }
                 if(afisQualityCks.get(i).getCcsjQssj()!=null&&!"".equals(afisQualityCks.get(i).getCcsjQssj())){
                     afisQualityCks.get(i).setCcsjQssjStr(df.format(afisQualityCks.get(i).getCcsjQssj()));
                 }else{

src/main/resources/static/xtba/zljc/js/zljc.js

@@ -263,7 +263,7 @@ var nameValue =[{name: "wz", value: ""}, {name: "zmzp", value: ""},{name: "zcmzp
                 {name: "pmzs", value: ""}, {name: "pmzz", value: ""},{name: "pmzh", value: ""}, {name: "pmzx", value: ""}];
 
 
-function btnChange(obj,num,i){debugger
+function btnChangeZlCC(obj,num,i){debugger
     //抽查结果默认为1（合格）
     var result = "1";
     var currentResult="";
@@ -300,6 +300,7 @@ function btnChange(obj,num,i){debugger
             if($(obj).parents("dl").find(".bhg-bg").length==0){
                 $(obj).parents("dl").append(html);
             }
+            removeClassChange(num,1);
         }else{
             //TODO 检查合格时，先清除所有标签，在给合格添上选中标签
             if(num=='wz'){
@@ -327,6 +328,47 @@ function btnChange(obj,num,i){debugger
 
 }
 
+function btnChange(obj,num,i){
+    var html='<dt class="bhg-bg"></dt>';
+    if($(obj).hasClass("act-btn")){
+        $(obj).removeClass("act-btn").find("i").remove();
+        $("#"+num).removeClass("act-btn-small").find("i").remove();
+        if($(obj).parents("dl").find(".act-btn").length==0){
+            $(obj).parents("dl").find(".bhg-bg").remove();
+        }
+        changeJcjg(num,0);
+    }else{
+        if(num=='wz'){
+            removeClassChange(num,3);
+        }else if(num=='zmzp'||num=='zcmzp'||num=='ycmzp'){
+            removeClassChange(num,4);
+        }else if(num=='gdzm'||num=='gdzs'||num=='gdzz'||num=='gdzh'||num=='gdzx'||num=='gdym'||num=='gdys'||num=='gdyz'||num=='gdyh'||num=='gdyx'||
+            num=='pmzm'||num=='pmzs'||num=='pmzz'||num=='pmzh'||num=='pmzx'||num=='pmym'||num=='pmys'||num=='pmyz'||num=='pmyh'||num=='pmyx'
+        ){
+            removeClassChange(num,5);
+        }
+        if(i!=1){
+            $(obj).addClass("act-btn");
+            $("#"+num).addClass("act-btn-small");
+            $(obj).append('<i class="fa fa-check fa-zdy"></i>');
+            if($(obj).parents("dl").find(".bhg-bg").length==0){
+                $(obj).parents("dl").append(html);
+            }
+        }else{
+            $(obj).removeClass("act-btn").find("i").remove();
+            $("#"+num).removeClass("act-btn-small").find("i").remove();
+            if($(obj).parents("dl").find(".act-btn").length==0){
+                $(obj).parents("dl").find(".bhg-bg").remove();
+            }
+            $(obj).addClass("act-btn");
+            $("#"+num).addClass("act-btn-small");
+            $(obj).append('<i class="fa fa-check fa-zdy"></i>');
+        }
+        changeJcjg(num,i);
+    }
+
+}
+
 function addClassChangeBhg(name,value){
     var html='<dt class="bhg-bg"></dt>';
     if(value!=1){
@@ -672,7 +714,7 @@ function saveZlcc(jcjg) {
                             });
                             window.opener.location.reload();
                             // window.opener.document.getElementById("").valueO
-                            window.opener.doQuery('0');
+                            window.opener.doQuery('2');
                             window.close();
                         });
                     } else {

src/main/resources/templates/zlcc/iframe1.html

@@ -145,6 +145,7 @@
 
                 return "<a href='javascript:void(0)' onclick='  zlcc(\"" + xxbh + "\",\"2\",\"" + rwbh + "\",\"" + sfdrw + "\")'>"+rwbh+"</a>";;
             }},
+            {title:"创建时间",field:"cjsjStr",align:'center',width:120},
             {title:"任务时间",field:"ccsjQssjStr",align:'center',width:285,formatter:function(val,row,index){
                 var ccsjQssjStr=row.ccsjQssjStr;
                 var ccsjJzsjStr=row.ccsjJzsjStr;

src/main/resources/templates/zlcc/rwlist.html

@@ -41,16 +41,16 @@
                     <td colspan="6" style="height:20px;"></td>
                 </tr>
                 <tr>
-                    <td class="ar" width="13.3%">任务时间：</td>
+                    <td class="ar" width="13.3%">任务创建时间：</td>
                     <td width="20%">
                                 <span class="textbox">
-                                    <input id="ccsjQssj" name="ccsjQssj" class="Wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd'})"/>
+                                    <input id="fjcsjStr" name="fjcsjStr" class="Wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd'})"/>
                                 </span>
                     </td>
                     <td class="ar" width="13.3%">至：</td>
                     <td width="20%">
                                 <span class="textbox">
-                                    <input id="ccsjJzsj" name="ccsjJzsj" class="Wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd'})"/>
+                                    <input id="ejcsjStr" name="ejcsjStr" class="Wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd'})"/>
                                 </span>
                     </td>
                     <td class="ar" width="13.3%">任务对象：</td>
@@ -145,6 +145,7 @@
                 var sfdrw= (ccdw.indexOf(',') >= 0);
                 return "<a href='javascript:void(0)' onclick='zlcc(\"" + xxbh + "\",\"3\",\"" + rwbh + "\",\"" + sfdrw + "\")'>"+rwbh+"</a>";;
             }},
+            {title:"创建时间",field:"cjsjStr",align:'center',width:120},
             {title:"任务时间",field:"ccsjQssjStr",align:'center',width:285,formatter:function(val,row,index){
                 var ccsjQssjStr=row.ccsjQssjStr;
                 var ccsjJzsjStr=row.ccsjJzsjStr;

src/main/resources/templates/zlcc/zlcc.html

@@ -397,13 +397,19 @@
             pageSize: 20,
             pageList: [10, 20, 50, 100, 200], //rows
             pageNumber: 1,
-            loadFilter: function (data) {
+            loadFilter: function (data) {debugger
                 count++;
-                if (data.rows.length < $('#ccfs').val() && count < 2) {
+                if (data.rows.length == 0 && count < 2) {
                     doQuery('0')
                 } else {
-                    return data;
+                    if(flg =="0"){
+                        // $('#zljctable').datagrid('reload');
+                        doQuery("2")
+                    }else {
+                        return data;
+                    }
                 }
+
             }
         });
     }
@@ -423,7 +429,7 @@
         var rwbh = $('#rwbh').val();
 
         // window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
-        window.open("/toZlcc?rybh=" + rybh + "&szzwbh=" + szzwbh + "&ccbh=" + $("#ccbh").val()+ "&rwbh=" + rwbh, '_blank');
+        // window.open("/toZlcc?rybh=" + rybh + "&szzwbh=" + szzwbh + "&ccbh=" + $("#ccbh").val()+ "&rwbh=" + rwbh, '_blank');
         var ccfs = $("#ccfs").val();
         var jcfs = $("#jcfs").val();
         if (jcfs >= ccfs) {
@@ -450,7 +456,7 @@
                         alert("指纹库没有相关人员，请过一会再检查！")
                     }
                 } else {
-                    window.open("/toZlcc?rybh=" + rybh + "&szzwbh=" + szzwbh + "&ccbh=" + $("#ccbh").val(), '_blank');
+                    window.open("/toZlcc?rybh=" + rybh + "&szzwbh=" + szzwbh + "&ccbh=" + $("#ccbh").val()+ "&rwbh=" + rwbh, '_blank');
                     //window.open("/toZljc?rybh="+rybh+"&szzwbh="+szzwbh,'_blank');
                 }
             },

src/main/resources/templates/zljc/zljccx.html

@@ -92,7 +92,7 @@
                     <td class="td_r">采集单位：</td>
                     <td>
                         <p class="datebox-h">
-                            <input type="text" style="height: 25px;" id="RCjdw" name="RCjdw" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'">
+                            <input type="text" style="height: 25px;" id="RCjdw" name="RCjdw" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_QGUNIT',method:'get',textField : 'text', valueField : 'id'">
                         </p>
                     </td>
                 </tr>