Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit c4b0da7f authored by dahai's avatar dahai
Browse files
Options

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

工位类型数量需减去废证数量
废证工作流修改
parent ff5496c2
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 33 deletions
src/main/java/com/yxproject/start/api/ReportApi.java 0 → 100644
View file @ c4b0da7f
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
View file @ c4b0da7f
......@@ -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
View file @ c4b0da7f
......@@ -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/mapper/TaskListMapper.java
View file @ c4b0da7f
......@@ -434,7 +434,7 @@ public interface TaskListMapper {
* @param process 工序
* @return
*/
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(*) police_Count,'000000000' police_code ,'000000000' GAJG_MC,\n" +
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(*) police_Count,police_dic.police_code ,police_dic.police_name GAJG_MC,\n" +
"sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count," +
"sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,\n" +
"task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,\n" +
......@@ -447,13 +447,15 @@ public interface TaskListMapper {
"left join (select accept_no, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR and accept_no not in (select accept_no from special_card ) \n" +
"group by accept_no ) fc on substr(fc.accept_no,0,8) = group_no.group_no \n" +
"left join prod_trace_t@PROD_LINK on SUBSTR(prod_trace_t.ACCEPT_NO,0,8) = group_no.GROUP_NO\n" +
"left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
"left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO " +
"left join PROD_GROUP_T@PROD_LINK on PROD_GROUP_T.group_no =group_no.GROUP_NO " +
"left join PROD_GROUP_RELATION_T@PROD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no\n" +
"left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12)\n" +
" left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = group_no.GROUP_NO " +
"where task.TASK_STATE_ID = #{process} and task.work_group=#{workGroup}\n" +
"and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
"nvl(fc.faileCount,0),'000000000','000000000',nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by group_no.GROUP_NO")
"nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
......@@ -463,7 +465,7 @@ public interface TaskListMapper {
* @param process 工序
* @return
*/
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(*) police_Count,'000000000' police_code ,'000000000' GAJG_MC,\n" +
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(*) police_Count,police_dic.police_code ,police_dic.police_name GAJG_MC,\n" +
"sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count," +
"sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,\n" +
"task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,\n" +
......@@ -478,11 +480,14 @@ public interface TaskListMapper {
"left join prod_trace_t@PROD_LINK on SUBSTR(prod_trace_t.ACCEPT_NO,0,8) = group_no.GROUP_NO\n" +
"left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
"left join PROD_GROUP_T@PROD_LINK on PROD_GROUP_T.group_no =group_no.GROUP_NO " +
"left join PROD_GROUP_RELATION_T@PROD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no\n" +
"left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12)\n" +
" left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = group_no.GROUP_NO " +
"where task.TASK_STATE_ID = #{process} \n" +
"and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
"nvl(fc.faileCount,0),'000000000','000000000',nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by group_no.GROUP_NO")
"nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common5(@Param("process") long process,@Param("process2") long process2);
......@@ -702,7 +707,7 @@ public interface TaskListMapper {
* @param process 工序
* @return
*/
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,police_dic.police_code ,police_dic.police_name GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
"SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
......@@ -712,12 +717,15 @@ public interface TaskListMapper {
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD \n" +
"where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
" left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9) " +
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9) " +
"left join PROD_GROUP_T@PROD_LINK on PROD_GROUP_T.group_no =substr(prod_trace_t.ACCEPT_NO,0,8) " +
"left join PROD_GROUP_RELATION_T@PROD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no " +
"left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12) "+
" left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " +
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.work_group=#{workGroup} and task.TASK_STATE_ID =#{process}\n" +
"group by task.submit_date, SPECIAL_CARD.task_id, '快证', '1', COUNTY_DIC.COUNTY_CODE, \n" +
"COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
"nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
"nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
/**
......@@ -726,7 +734,7 @@ public interface TaskListMapper {
* @param process 工序
* @return
*/
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,police_dic.police_code ,police_dic.police_name GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
"SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
......@@ -736,12 +744,15 @@ public interface TaskListMapper {
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD \n" +
"where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
" left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9) " +
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9) " +
"left join PROD_GROUP_T@PROD_LINK on PROD_GROUP_T.group_no =substr(prod_trace_t.ACCEPT_NO,0,8) " +
"left join PROD_GROUP_RELATION_T@PROD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no\n" +
"left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12)\n" +
" left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " +
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID =#{process}\n" +
"group by task.submit_date, SPECIAL_CARD.task_id, '快证', '1', COUNTY_DIC.COUNTY_CODE, \n" +
"COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
"nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
"nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast5(@Param("process") long process,@Param("process2") long process2);
......@@ -1057,7 +1068,7 @@ public interface TaskListMapper {
* @param process 工序
* @return
*/
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,police_dic.police_code ,police_dic.police_name GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
"SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
......@@ -1067,12 +1078,15 @@ public interface TaskListMapper {
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD \n" +
"where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)" +
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)" +
"left join PROD_GROUP_T@PROD_LINK on PROD_GROUP_T.group_no =substr(prod_trace_t.ACCEPT_NO,0,8) " +
"left join PROD_GROUP_RELATION_T@PROD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no " +
"left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12) "+
" left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " +
" where SPECIAL_CARD.SPECIAL_TYPE =1 and task.work_group=#{workGroup} and task.TASK_STATE_ID =#{process} " +
"group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, \n" +
"COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
"nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
"nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
......@@ -1082,7 +1096,7 @@ public interface TaskListMapper {
* @param process 工序
* @return
*/
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
@Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,police_dic.police_code ,police_dic.police_name GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
"SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
......@@ -1092,12 +1106,15 @@ public interface TaskListMapper {
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD \n" +
"where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)" +
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)" +
"left join PROD_GROUP_T@PROD_LINK on PROD_GROUP_T.group_no =substr(prod_trace_t.ACCEPT_NO,0,8) " +
"left join PROD_GROUP_RELATION_T@PROD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no\n" +
"left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12)\n" +
" left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " +
" where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID =#{process} " +
"group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, \n" +
"COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
"nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
"nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind5(@Param("process") long process,@Param("process2") long process2);
......@@ -1164,7 +1181,7 @@ public interface TaskListMapper {
* @return
*/
@Select("select DISTINCT 0 finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,\n" +
"substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count," +
"police_dic.police_code ,police_dic.police_name GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count," +
"sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,\n" +
"task.submit_date,FAILED_CARD.failed_card_id task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
......@@ -1174,9 +1191,12 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join prod_trace_t@PROD_LINK on prod_trace_t.ACCEPT_NO = FAILED_CARD.ACCEPT_NO\n" +
"left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
"left join PROD_GROUP_T@PROD_LINK on PROD_GROUP_T.group_no =substr(prod_trace_t.ACCEPT_NO,0,8) " +
"left join PROD_GROUP_RELATION_T@PROD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no " +
"left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12) "+
"where FAILED_CARD.STATE =#{process} and FAILED_CARD.work_group=#{workGroup} and FAILED_CARD.STATE!=FAILED_CARD.INITIATOR \n" +
"group by 0, substr(prod_card_t.upload_no,0,9), GAJG_DM.GAJG_MC, task.submit_date, FAILED_CARD.failed_card_id, \n" +
"group by 0, police_dic.police_code, police_dic.police_name, task.submit_date, FAILED_CARD.failed_card_id, \n" +
"'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0\n" +
"order by FAILED_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_failed2(@Param("process") long process,@Param("workGroup") long workGroup);
......@@ -1188,7 +1208,7 @@ public interface TaskListMapper {
* @return
*/
@Select("select DISTINCT 0 finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,\n" +
"substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count," +
"police_dic.police_code ,police_dic.police_name GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count," +
"sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,\n" +
"task.submit_date,FAILED_CARD.failed_card_id task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
......@@ -1198,9 +1218,12 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join prod_trace_t@PROD_LINK on prod_trace_t.ACCEPT_NO = FAILED_CARD.ACCEPT_NO\n" +
"left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
"left join PROD_GROUP_T@PROD_LINK on PROD_GROUP_T.group_no =substr(prod_trace_t.ACCEPT_NO,0,8) " +
"left join PROD_GROUP_RELATION_T@PROD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no\n" +
"left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12)\n" +
"where FAILED_CARD.STATE =#{process} and FAILED_CARD.STATE!=FAILED_CARD.INITIATOR \n" +
"group by 0, substr(prod_card_t.upload_no,0,9), GAJG_DM.GAJG_MC, task.submit_date, FAILED_CARD.failed_card_id, \n" +
"group by 0, police_dic.police_code, police_dic.police_name, task.submit_date, FAILED_CARD.failed_card_id, \n" +
"'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0\n" +
"order by FAILED_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_failed5(@Param("process") long process);
......
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ c4b0da7f
......@@ -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
View file @ c4b0da7f
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment