分拣、电写入显示派出所详情

工位类型数量需减去废证数量
废证工作流修改

src/main/java/com/yxproject/start/api/ReportApi.java

+package com.yxproject.start.api;
+
+import com.yxproject.start.entity.TaskList.CountCountyEntity;
+import com.yxproject.start.service.TaskListService;
+import net.sf.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @auther zhangyusheng
+ * 2019/4/9   12:04
+ * 报表接口
+ */
+
+@RestController
+@RequestMapping("ReportApi")
+public class ReportApi {
+    @Autowired
+    private TaskListService taskListService;
+
+    /**
+     * 查询报表
+     * 数据核验
+     * @param submitDate
+     * @return
+     */
+    @RequestMapping("queryReportApi")
+    public JSONObject selectByCounty(@RequestParam(value = "submitDate") String submitDate) {
+        List<CountCountyEntity> resultList = taskListService.selectByCounty(submitDate);
+        JSONObject resultJson = JSONObject.fromObject(resultList);
+        return resultJson;
+    }
+
+}

src/main/java/com/yxproject/start/entity/ReceiptListEntity.java

@@ -6,7 +6,7 @@ import java.util.Objects;
 
 /**
  * @auther zhangyusheng
- * 2019/3/12   21:51
+ * 2019/4/9   10:39
  */
 @Entity
 @Table(name = "RECEIPT_LIST", schema = "YINGXIN", catalog = "")
@@ -18,9 +18,12 @@ public class ReceiptListEntity {
     private Long finishCount;
     private Time checkDate;
     private String checkName;
-    private Long state;
+    private long state;
     private Long cardTypeId;
     private Long oldCardTypeId;
+    private long isPrint;
+    private String recheckName;
+    private Time recheckDate;
 
     @Id
     @Column(name = "ID")
@@ -94,11 +97,11 @@ public class ReceiptListEntity {
 
     @Basic
     @Column(name = "STATE")
-    public Long getState() {
+    public long getState() {
         return state;
     }
 
-    public void setState(Long state) {
+    public void setState(long state) {
         this.state = state;
     }
 
@@ -122,25 +125,58 @@ public class ReceiptListEntity {
         this.oldCardTypeId = oldCardTypeId;
     }
 
+    @Basic
+    @Column(name = "IS_PRINT")
+    public long getIsPrint() {
+        return isPrint;
+    }
+
+    public void setIsPrint(long isPrint) {
+        this.isPrint = isPrint;
+    }
+
+    @Basic
+    @Column(name = "RECHECK_NAME")
+    public String getRecheckName() {
+        return recheckName;
+    }
+
+    public void setRecheckName(String recheckName) {
+        this.recheckName = recheckName;
+    }
+
+    @Basic
+    @Column(name = "RECHECK_DATE")
+    public Time getRecheckDate() {
+        return recheckDate;
+    }
+
+    public void setRecheckDate(Time recheckDate) {
+        this.recheckDate = recheckDate;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         ReceiptListEntity that = (ReceiptListEntity) o;
         return id == that.id &&
+                state == that.state &&
+                isPrint == that.isPrint &&
                 Objects.equals(qrCode, that.qrCode) &&
                 Objects.equals(receiptDate, that.receiptDate) &&
                 Objects.equals(policeCode, that.policeCode) &&
                 Objects.equals(finishCount, that.finishCount) &&
                 Objects.equals(checkDate, that.checkDate) &&
                 Objects.equals(checkName, that.checkName) &&
-                Objects.equals(state, that.state) &&
                 Objects.equals(cardTypeId, that.cardTypeId) &&
-                Objects.equals(oldCardTypeId, that.oldCardTypeId);
+                Objects.equals(oldCardTypeId, that.oldCardTypeId) &&
+                Objects.equals(recheckName, that.recheckName) &&
+                Objects.equals(recheckDate, that.recheckDate);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, qrCode, receiptDate, policeCode, finishCount, checkDate, checkName, state, cardTypeId, oldCardTypeId);
+        return Objects.hash(id, qrCode, receiptDate, policeCode, finishCount, checkDate, checkName, state, cardTypeId, oldCardTypeId, isPrint, recheckName, recheckDate);
     }
 }

src/main/java/com/yxproject/start/mapper/ReceiptMapper.java

@@ -114,7 +114,7 @@ public interface ReceiptMapper {
     public int selectSpecialCardByAcceptNo(@Param("id") String id);
 
     //查询未复核交接单
-    @Select("SELECT RECEIPT_LIST.* ,GAJG_DM.GAJG_MC FROM RECEIPT_LIST LEFT JOIN GAJG_DM ON RECEIPT_LIST.POLICE_CODE=GAJG_DM.GAJG_DM where state=0\n")
+    @Select("SELECT RECEIPT_LIST.* ,GAJG_DM.GAJG_MC FROM RECEIPT_LIST LEFT JOIN GAJG_DM ON RECEIPT_LIST.POLICE_CODE=GAJG_DM.GAJG_DM where state=0 \n")
     public List<Map<String,Object>>selectReceiptListOfSpecialCard ();
 
     //根据身份证号查询普通证交接单

src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java

@@ -907,6 +907,8 @@ public class TaskListServiceImpl implements TaskListService {
                     typeName = countyMap.get("CARD_TYPE_ID") + "";
                     typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     typeSum -= Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
+                    //工位类型总数减去废证数量
+                    typeSum -= Integer.valueOf(countyMap.get("FAILECOUNT") + "");
                     validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
                     specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
@@ -1011,6 +1013,8 @@ public class TaskListServiceImpl implements TaskListService {
                     typeName = countyMap.get("CARD_TYPE_ID") + "";
                     typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     typeSum -= Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
+                    //工位类型总数减去废证数
+                    typeSum -= Integer.valueOf(countyMap.get("FAILECOUNT") + "");
                     validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
                     specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
@@ -1122,7 +1126,8 @@ public class TaskListServiceImpl implements TaskListService {
                     workGroup = countyMap.get("WORK_GROUP") + "";
                     typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     typeSum -= Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
-//                    typeSum -= Integer.valueOf(countyMap.get("FAILECOUNT") + "");
+                    //工位类型总数减去废证数量
+                    typeSum -= Integer.valueOf(countyMap.get("FAILECOUNT") + "");
                     validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
                     specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");

src/main/resources/static/views/task/taskListSorting.html

@@ -46,6 +46,7 @@
                                 <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
                                 <th>证件数量</th>
                                 <th>电写入数量</th>
+                                <th>电质检数量</th>
                                 <th>特殊证件数量</th>
                                 <th>废证数量</th>
                                 <th>复核数量</th>
@@ -65,6 +66,7 @@
                                 <td class="mailbox-subject">{{task.groupNum}}</td>
                                 <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                                 <td class="mailbox-subject">{{task.eWriteCount}}</td>
+                                <td class="mailbox-subject">{{task.checkCount}}</td>
                                 <td class="mailbox-subject">{{task.specialCount}}</td>
                                 <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">
                                     {{task.faileCount}}
@@ -86,6 +88,7 @@
                                         <th>派出所名称</th>
                                         <th>证件数量</th>
                                         <th>电写入数量</th>
+                                        <th>电质检数量</th>
                                         <th>特殊证件数量</th>
                                         <th>废证数量</th>
                                         <th></th>
@@ -96,6 +99,7 @@
                                             <td>{{item.GAJG_MC}}</td>
                                             <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
                                             <td>{{item.E_WRITER_COUNT}}</td>
+                                            <td>{{item.CHECK_COUNT}}</td>
                                             <td>{{item.SPECIAL_CARD_COUNT}}</td>
                                             <td>{{item.FAILECOUNT}}</td>
                                             <td>