Skip to content

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

Merge remote-tracking branch 'origin/dev' into dev

parents 447b819c 4e831e0f
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 138 deletions
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ f7fed07e
......@@ -28,152 +28,145 @@ public class ReceiptApi {
@Autowired
private ReceiptService receiptService;
/**
* 生成交接单 快证保存ACCEPT_NO 普通证保存GROUP_NO
*
* @param id
* @return
*/
@RequestMapping("createReceiptList")
@Transactional(rollbackFor = Exception.class)
public boolean createReceiptList(@RequestParam("id") String id) {
//判断是否是特证
if (receiptService.selectSpecialCardByAcceptNo(id) == 1) {
//查询这个受理号是否生成了交接单
int countAccept = receiptService.selectCountById(id);
//判断是否生成了交接单
if (countAccept == 0) {
//查询特证交接单所需数据
Map<String, Object> resultDate = receiptService.selectReceiptListDate(id);
ReceiptListEntity receiptListEntity = new ReceiptListEntity();
receiptListEntity.setPoliceCode(resultDate.get("GAJG_DM").toString());
receiptListEntity.setCardTypeId(Long.valueOf((BigDecimal)resultDate.get("CARD_TYPE")+""));
if ("null".equals(resultDate.get("OLD_CARD_TYPE")+"")){
}else {
receiptListEntity.setOldCardTypeId(Long.valueOf(resultDate.get("OLD_CARD_TYPE")+""));
}
receiptListEntity.setFinishCount(Long.valueOf(resultDate.get("VALID_COUNT").toString()));
receiptListEntity.setQrCode(resultDate.get("ACCEPT_NO").toString());
receiptListEntity.setState((long)0);
//生成特证交接单
Boolean S= receiptService.createReceiptList(receiptListEntity);
//查询特证详单所需数据
Map<String, Object> detailedData = receiptService.selectDetailedData2(id);
String uploadNo = (String) detailedData.get("UPLOAD_NO");
String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
String name = (String) detailedData.get("NAME");
String sex = (String) detailedData.get("SEX");
String cardId = (String) detailedData.get("CARD_ID");
String gajg_dm = (String) detailedData.get("GAJG_DM");
int receiptId = Integer.parseInt((BigDecimal) detailedData.get("ID") + "");
//生成特证详单
receiptService.createDetailedList(uploadNo, acceptNo2, name, id, gajg_dm, receiptId,sex);
//判断是否是特证
if (receiptService.selectSpecialCardByAcceptNo(id) == 1) {
//查询这个受理号是否生成了交接单
int countAccept = receiptService.selectCountById(id);
//判断是否生成了交接单
if (countAccept == 0) {
//查询特证交接单所需数据
Map<String, Object> resultDate = receiptService.selectReceiptListDate(id);
ReceiptListEntity receiptListEntity = new ReceiptListEntity();
receiptListEntity.setPoliceCode(resultDate.get("GAJG_DM").toString());
receiptListEntity.setCardTypeId(Long.valueOf((BigDecimal) resultDate.get("CARD_TYPE") + ""));
if ("null".equals(resultDate.get("OLD_CARD_TYPE") + "")) {
} else {
//已经生成特证交接单，不做操作。
receiptListEntity.setOldCardTypeId(Long.valueOf(resultDate.get("OLD_CARD_TYPE") + ""));
}
receiptListEntity.setFinishCount(Long.valueOf(resultDate.get("VALID_COUNT").toString()));
receiptListEntity.setQrCode(resultDate.get("ACCEPT_NO").toString());
receiptListEntity.setState((long) 0);
//生成特证交接单
Boolean S = receiptService.createReceiptList(receiptListEntity);
//查询特证详单所需数据
Map<String, Object> detailedData = receiptService.selectDetailedData2(id);
String uploadNo = (String) detailedData.get("UPLOAD_NO");
String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
String name = (String) detailedData.get("NAME");
String sex = (String) detailedData.get("SEX");
String cardId = (String) detailedData.get("CARD_ID");
String gajg_dm = (String) detailedData.get("GAJG_DM");
Long receiptId = receiptListEntity.getId();
//生成特证详单
receiptService.createDetailedList(uploadNo, acceptNo2, name, id, gajg_dm, receiptId, sex);
} else {
//根据身份证号查组号
String groupNo= receiptService.selectGroupNoById(id);
//查询交接单所需数据
List<Map<String, Object>> receiptListDate = receiptService.selectReceiptListDate2(groupNo);
//已经生成特证交接单，不做操作。
}
} else {
//根据身份证号查组号
String groupNo = receiptService.selectGroupNoById(id);
//查询交接单所需数据
List<Map<String, Object>> receiptListDate = receiptService.selectReceiptListDate2(groupNo);
for (int i = 0; i<receiptListDate.size();i++){
for (int i = 0; i < receiptListDate.size(); i++) {
ReceiptListEntity receiptListEntity = new ReceiptListEntity();
receiptListEntity.setPoliceCode(receiptListDate.get(i).get("GAJG_DM").toString());
receiptListEntity.setCardTypeId(Long.valueOf((BigDecimal)receiptListDate.get(i).get("CARD_TYPE")+""));
if ("null".equals(receiptListDate.get(i).get("OLD_CARD_TYPE")+"")){
ReceiptListEntity receiptListEntity = new ReceiptListEntity();
receiptListEntity.setPoliceCode(receiptListDate.get(i).get("GAJG_DM").toString());
receiptListEntity.setCardTypeId(Long.valueOf((BigDecimal) receiptListDate.get(i).get("CARD_TYPE") + ""));
if ("null".equals(receiptListDate.get(i).get("OLD_CARD_TYPE") + "")) {
}else {
receiptListEntity.setOldCardTypeId(Long.valueOf(receiptListDate.get(i).get("OLD_CARD_TYPE")+""));
}
receiptListEntity.setFinishCount((long)receiptListDate.size());
receiptListEntity.setQrCode(receiptListDate.get(i).get("GROUP_NO").toString());
receiptListEntity.setState((long)0);
//查询这个组号是否生成了交接单
int countGroup = receiptService.selectByGroupNo(receiptListDate.get(i).get("GROUP_NO").toString());
//没有生成交接单
if (countGroup == 0) {
//生成交接单
receiptService.createReceiptList(receiptListEntity);
//todo 查询交接单对应的详单 循环遍历 是否生成对应详单 生成 不做操作 没有生成 遍历插入
for(int n =0; n< receiptListDate.size();n++){
} else {
receiptListEntity.setOldCardTypeId(Long.valueOf(receiptListDate.get(i).get("OLD_CARD_TYPE") + ""));
}
receiptListEntity.setFinishCount((long) receiptListDate.size());
receiptListEntity.setQrCode(receiptListDate.get(i).get("GROUP_NO").toString());
receiptListEntity.setState((long) 0);
//查询这个组号是否生成了交接单
int countGroup = receiptService.selectByGroupNo(receiptListDate.get(i).get("GROUP_NO").toString());
//没有生成交接单
if (countGroup == 0) {
//生成交接单
receiptService.createReceiptList(receiptListEntity);
//todo 查询交接单对应的详单 循环遍历 是否生成对应详单 生成 不做操作 没有生成 遍历插入
for (int n = 0; n < receiptListDate.size(); n++) {
// receiptService.
//查询这个身份证是否生成了详单
int receiptCount = receiptService.selectReceiptById(receiptListDate.get(n).get("ID_NO").toString());
//没有生成交接单详单
if (receiptCount == 0) {
Map<String, Object> detailedData = receiptService.selectDetailedData(receiptListDate.get(n).get("ID_NO").toString());
String uploadNo = (String) detailedData.get("UPLOAD_NO");
String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
String name = (String) detailedData.get("NAME");
String sex = (String) detailedData.get("SEX");
String gajg_dm = (String) detailedData.get("GAJG_DM");
int receiptId = Integer.parseInt((BigDecimal) detailedData.get("ID") + "");
//生成详单
receiptService.createDetailedList(uploadNo, acceptNo2, name, receiptListDate.get(i).get("GROUP_NO").toString(), gajg_dm, receiptId,sex);
} else {
//不做操作
}
}
} else {
//已生成交接单
//查询这个身份证是否生成了详单
int receiptCount = receiptService.selectReceiptById(id);
//未生成交接单详单
int receiptCount = receiptService.selectReceiptById(receiptListDate.get(n).get("ID_NO").toString());
//没有生成交接单详单
if (receiptCount == 0) {
//查询交接单详单数据
Map<String, Object> detailedData = receiptService.selectDetailedData(id);
Map<String, Object> detailedData = receiptService.selectDetailedData(receiptListDate.get(n).get("ID_NO").toString());
String uploadNo = (String) detailedData.get("UPLOAD_NO");
String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
String name = (String) detailedData.get("NAME");
String sex = (String) detailedData.get("SEX");
String sex = (String) detailedData.get("SEX_NO");
String gajg_dm = (String) detailedData.get("GAJG_DM");
int receiptId = Integer.parseInt((BigDecimal) detailedData.get("ID") + "");
//生成详单
receiptService.createDetailedList(uploadNo, acceptNo2, name, id, gajg_dm, receiptId,sex);
receiptService.createDetailedList(uploadNo, acceptNo2, name, receiptListDate.get(n).get("ID_NO").toString(), gajg_dm, receiptId, sex);
} else {
//已生成详单，不做操作。
//不做操作
}
}
//查询有几个特证
int specialCardCount = receiptService.selectSpecialCard(receiptListDate.get(i).get("GROUP_NO").toString());
//减去特证个数
int finishCount = receiptService.selectCount(receiptListDate.get(i).get("GROUP_NO").toString()) - specialCardCount;
receiptService.updateFinishCount(receiptListDate.get(i).get("GROUP_NO").toString(), finishCount);
} else {
//已生成交接单
}
// //查询有几个特证
// int specialCardCount = receiptService.selectSpecialCard(receiptListDate.get(i).get("GROUP_NO").toString());
// //减去特证个数
// int finishCount = receiptService.selectCount(receiptListDate.get(i).get("GROUP_NO").toString()) - specialCardCount;
// receiptService.updateFinishCount(receiptListDate.get(i).get("GROUP_NO").toString(), finishCount);
}
}
return true;
}
/**
* 查询交接单数据
*
* @return
*/
@RequestMapping("selectRecriptData")
public List<Map<String,Object>> selectRecriptData(){
public List<Map<String, Object>> selectRecriptData() {
//返回交接单数据
List<Map<String,Object>> resultMap=receiptService.selectReceiptListOfSpecialCard();
for (int i=0;i<resultMap.size();i++){
String groupNo= (String) resultMap.get(i).get("QR_CODE");
Map<String,Object> map= receiptService.selectCountTime(groupNo);
resultMap.get(i).put("download",map.get("DOWNLOAD"));
resultMap.get(i).put("checkerCount",map.get("CHECKERCOUNT"));
resultMap.get(i).put("electricCount",map.get("ELECTRICCOUNT"));
List<Map<String, Object>> resultMap = receiptService.selectReceiptListOfSpecialCard();
for (int i = 0; i < resultMap.size(); i++) {
String groupNo = (String) resultMap.get(i).get("QR_CODE");
if (groupNo.length()==10){
Map<String, Object> map = receiptService.selectCountTimeT(groupNo);
resultMap.get(i).put("download", map.get("DOWNLOAD"));
resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT"));
resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT"));
}else {
Map<String, Object> map = receiptService.selectCountTime(groupNo);
resultMap.get(i).put("download", map.get("DOWNLOAD"));
resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT"));
resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT"));
}
}
return resultMap;
}
......@@ -181,32 +174,34 @@ public class ReceiptApi {
/**
* 根据任务单查询详细信息
*
* @param receiptId
* @return
*/
@RequestMapping("selectDetailList")
public List<Map<String,Object>> selectDetailList(@RequestParam("receiptId") String receiptId){
public List<Map<String, Object>> selectDetailList(@RequestParam("receiptId") String receiptId) {
List<Map<String, Object>> resultList = receiptService.selectDetailList(receiptId);
for (int i=0;i<resultList.size();i++){
String acceptNo= (String) resultList.get(i).get("ACCEPT_NO");
Map<String,Object> map= receiptService.selectTimes(acceptNo);
resultList.get(i).put("downloadDate",map.get("DOWNLOADDATE"));
resultList.get(i).put("checkDate",map.get("CHECKDATE"));
resultList.get(i).put("electricDate",map.get("ELECTRICDATE"));
}
for (int i = 0; i < resultList.size(); i++) {
String acceptNo = (String) resultList.get(i).get("ACCEPT_NO");
Map<String, Object> map = receiptService.selectTimes(acceptNo);
resultList.get(i).put("downloadDate", map.get("DOWNLOADDATE"));
resultList.get(i).put("checkDate", map.get("CHECKDATE"));
resultList.get(i).put("electricDate", map.get("ELECTRICDATE"));
}
return resultList;
}
/**
* 数据核验--更改交接单状态
*
* @param receiptId
* @param checkName
* @return
*/
@RequestMapping("updateReceiptList")
public boolean updateReceiptList(@RequestParam("receiptId")String receiptId,@RequestParam("checkName") String checkName){
public boolean updateReceiptList(@RequestParam("receiptId") String receiptId, @RequestParam("checkName") String checkName) {
SimpleDateFormat dt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
try {
Date date = dt.parse(dt.format(new Date()));
......@@ -220,33 +215,35 @@ public class ReceiptApi {
/**
* 根据受理号查询详单信息
*
* @param jsonStr
* @return
*/
@RequestMapping("selectDetailByAcceptNo")
public List<DetailReceiptListEntity> selectDetailByAcceptNo(@RequestBody String jsonStr){
public List<DetailReceiptListEntity> selectDetailByAcceptNo(@RequestBody String jsonStr) {
JSONArray jsonarray = JSONArray.fromObject(jsonStr);
List<DetailReceiptListEntity> resultList = new ArrayList<>();
for (int i=0;i<jsonarray.size();i++){
DetailReceiptListEntity detailReceiptListEntity= receiptService.selectDetailByAcceptNo((String) jsonarray.get(i));
for (int i = 0; i < jsonarray.size(); i++) {
DetailReceiptListEntity detailReceiptListEntity = receiptService.selectDetailByAcceptNo((String) jsonarray.get(i));
resultList.add(detailReceiptListEntity);
}
return resultList;
return resultList;
}
/**
* 更改备注信息
*
* @param jsonStr
* @return
*/
@RequestMapping("updateDetailNote")
public boolean updateDetailNote(@RequestBody String jsonStr){
public boolean updateDetailNote(@RequestBody String jsonStr) {
JSONArray jsonArray = JSONArray.fromObject(jsonStr);
for (int i=0;i<jsonArray.size();i++){
Map<String,Object> resultMap= (Map<String, Object>) jsonArray.get(i);
receiptService.updateDetail(resultMap.get("acceptNo").toString(),resultMap.get("note").toString());
for (int i = 0; i < jsonArray.size(); i++) {
Map<String, Object> resultMap = (Map<String, Object>) jsonArray.get(i);
receiptService.updateDetail(resultMap.get("acceptNo").toString(), resultMap.get("note").toString());
}
return true;
}
......@@ -254,11 +251,12 @@ public class ReceiptApi {
/**
* 生成交接单
*
* @param receiptId
* @return
*/
@RequestMapping("updateReceiptDateByReceiptId")
public boolean updateReceiptDateByReceiptId(@RequestParam("receiptId")String receiptId){
public boolean updateReceiptDateByReceiptId(@RequestParam("receiptId") String receiptId) {
try {
receiptService.updateReceiptDateByReceiptId(receiptId);
} catch (Exception e) {
......@@ -269,11 +267,12 @@ public class ReceiptApi {
/**
* 查询交接单
*
* @param date 复核时间
* @return
*/
@RequestMapping("queryReceiptDateByCheckDate")
public List<Map<String,Object>> queryReceiptDateByCheckDate(@RequestParam("date")String date){
public List<Map<String, Object>> queryReceiptDateByCheckDate(@RequestParam("date") String date) {
return receiptService.selectReceiptDateByCheckDate(replaceDate(date));
}
......@@ -288,7 +287,4 @@ public class ReceiptApi {
}
}
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ f7fed07e
......@@ -58,6 +58,7 @@ public interface ReceiptMapper {
",#{oldCardTypeId}" +
"</if> " +
") </script>")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
public boolean createReceiptList(ReceiptListEntity receiptListEntity);
......@@ -93,7 +94,7 @@ public interface ReceiptMapper {
//生成交接单详单
@Insert("INSERT INTO DETAIL_RECEIPT_LIST (UPLOAD_NO,accept_no,name,card_id,POLICE_CODE,RECEIPT_ID)" +
"VALUES(#{UPLOAD_NO},#{ACCEPT_NO},#{NAME},#{CARD_ID},#{GAJG_DM},#{RECEIPT_ID})")
public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")int RECEIPT_ID,@Param("SEX")String SEX);
public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")long RECEIPT_ID,@Param("SEX")String SEX);
......@@ -161,11 +162,21 @@ public interface ReceiptMapper {
"count(prod_trace_t.download_no)as download,\n" +
"count(prod_trace_t.checker_no) as checkerCount,\n" +
"count(prod_trace_t.ELECTRIC_WRITER_NO)as electricCount\n" +
"from prod_trace_t@PROD_LINK \n" +
"WHERE subStr(ACCEPT_NO,0,8) = #{groupNo} or ACCEPT_NO=#{groupNo}")
"from prod_trace_t@PROD_LINK " +
"WHERE (subStr(ACCEPT_NO,0,8) = #{groupNo} or ACCEPT_NO=#{groupNo}) and prod_trace_t.accept_no not in (select special_card.accept_no from special_card ) ")
public Map<String,Object> selectCountTime(@Param("groupNo") String groupNo);
@Select("select \n" +
"count(prod_trace_t.download_no)as download,\n" +
"count(prod_trace_t.checker_no) as checkerCount,\n" +
"count(prod_trace_t.ELECTRIC_WRITER_NO)as electricCount\n" +
"from prod_trace_t@PROD_LINK " +
"WHERE ACCEPT_NO=#{groupNo}")
public Map<String,Object> selectCountTimeT(@Param("groupNo") String groupNo);
@Select("select \n" +
"prod_trace_t.DOWNLOAD_DATE as downloadDate,\n" +
"prod_trace_t.CHECK_DATE as checkDate,\n" +
......
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ f7fed07e
......@@ -409,7 +409,7 @@ public interface TaskListMapper {
* @param process 工序
* @return
*/
@Select("select DISTINCT nvl(sum(RECEIPT_LIST.FINISH_COUNT),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,\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,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,\n" +
"sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,\n" +
"task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,\n" +
"CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
......@@ -427,7 +427,7 @@ public interface TaskListMapper {
"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),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC order by group_no.GROUP_NO")
"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 group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process,@Param("process2") long process2);
/**
......@@ -573,7 +573,7 @@ public interface TaskListMapper {
* @param process 工序
* @return
*/
@Select("select DISTINCT nvl(sum(RECEIPT_LIST.FINISH_COUNT),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,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,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,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" +
......@@ -588,7 +588,7 @@ public interface TaskListMapper {
"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 order by SPECIAL_CARD.ACCEPT_NO")
"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")
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast2(@Param("process") long process,@Param("process2") long process2);
/**
......@@ -833,7 +833,7 @@ public interface TaskListMapper {
* @param process 工序
* @return
*/
@Select("select DISTINCT nvl(sum(RECEIPT_LIST.FINISH_COUNT),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,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,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,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" +
......@@ -848,7 +848,7 @@ public interface TaskListMapper {
" where SPECIAL_CARD.SPECIAL_TYPE =2 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 order by SPECIAL_CARD.ACCEPT_NO")
"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")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process,@Param("process2") long process2);
......
src/main/java/com/yxproject/start/service/ReceiptService.java
View file @ f7fed07e
......@@ -16,7 +16,7 @@ public interface ReceiptService {
public Map<String,Object>selectDetailedData(String id);
public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")int RECEIPT_ID,@Param("SEX")String SEX);
public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")long RECEIPT_ID,@Param("SEX")String SEX);
public int selectSpecialCard(String GROUP_NO);
......@@ -71,4 +71,6 @@ public interface ReceiptService {
public String selectGroupNoById(String id);
public Map<String,Object> selectCountTimeT( String groupNo);
}
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ f7fed07e
......@@ -33,7 +33,7 @@ public class ReceiptServiceImpl implements ReceiptService {
}
@Override
public boolean createDetailedList(String UPLOAD_NO, String ACCEPT_NO, String NAME, String CARD_ID, String GAJG_DM, int RECEIPT_ID,String SEX) {
public boolean createDetailedList(String UPLOAD_NO, String ACCEPT_NO, String NAME, String CARD_ID, String GAJG_DM, long RECEIPT_ID,String SEX) {
receiptMapper.createDetailedList(UPLOAD_NO,ACCEPT_NO,NAME,CARD_ID,GAJG_DM,RECEIPT_ID,SEX);
return true;
}
......@@ -186,6 +186,12 @@ public class ReceiptServiceImpl implements ReceiptService {
return mapList.get(0).get("GROUPNO").toString();
}
@Override
public Map<String, Object> selectCountTimeT(String groupNo) {
Map<String, Object> resultMap = receiptMapper.selectCountTimeT(groupNo);
return resultMap;
}
private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) {
Map<String, Object> typeMap = new LinkedHashMap<>();
for (Map o : maplist) {
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ f7fed07e
......@@ -58,9 +58,9 @@
<td>禁用:</td>
<td style="text-align: left;">
<select class="form-control select2" id="packageType">
<option value="">--请选择禁用状态--</option>
<option value="">全部</option>
<option value="0">是</option>
<option value="1">否</option>
<option value="1" selected>否</option>
</select>
</td>
<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