Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 571b5508 authored by wuzhilong's avatar wuzhilong
Browse files
Options

库房报表页面，组号缩写，分拣任务单判断，数据核验报表

parent c2100301
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 84 deletions
src/main/java/com/yxproject/start/mapper/DataAuditingMapper.java
View file @ 571b5508
......@@ -33,8 +33,8 @@ public interface DataAuditingMapper {
public List<Map<String, Object>> selectDataAuditingEntity(@Param("groupNo") String groupNo);
@Select("<script>" +
"select nvl(DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,'000000000') GAJG_MC,DATA_AUDITING.POLICE_SUBSTATION,sum(DATA_AUDITING.VALID_COUNT) VALID_COUNT,\n" +
"sum(DATA_AUDITING.INVALID_COUNT) inVALID_COUNT,to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd') SUBMIT_DATE,CARD_TYPE_DIC.CARD_TYPE,\n" +
"select nvl(DIC_UPLOAD_UNIT_T.UNIT_NAME,'000000000') GAJG_MC,DATA_AUDITING.POLICE_SUBSTATION,sum(DATA_AUDITING.VALID_COUNT) VALID_COUNT,\n" +
"sum(DATA_AUDITING.INVALID_COUNT) inVALID_COUNT,CARD_TYPE_DIC.CARD_TYPE,\n" +
"CARD_TYPE_DIC.CARD_TYPE_ID,1-(sum(DATA_AUDITING.VALID_COUNT)/(sum(DATA_AUDITING.VALID_COUNT)+sum(DATA_AUDITING.inVALID_COUNT))) Failure_rate from DATA_AUDITING \n" +
"left join TASK on TASK.TASK_ID = DATA_AUDITING.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = TASK.CARD_TYPE " +
......@@ -50,7 +50,7 @@ public interface DataAuditingMapper {
" and TASK.CARD_TYPE = ${typeCode}"+
"</if> " +
" and to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd') BETWEEN ${startDate} and ${endDate} \n" +
"group by nvl(DIC_UPLOAD_UNIT_T.UNIT_NAME,'000000000'),DATA_AUDITING.POLICE_SUBSTATION, to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd'), CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"group by nvl(DIC_UPLOAD_UNIT_T.UNIT_NAME,'000000000'),DATA_AUDITING.POLICE_SUBSTATION, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"order by DATA_AUDITING.POLICE_SUBSTATION" +
"</script>")
public List<Map<String, Object>> selectDataAuditingReport(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("policeName") String policeName, @Param("policeCode") String policeCode,@Param("typeCode")String typeCode);
......
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ 571b5508
......@@ -205,25 +205,27 @@ public class TaskListServiceImpl implements TaskListService {
if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
} else {
List<String> c = new ArrayList<>();
List<String> nsList = new ArrayList<>();
List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) {
/**
* 判断组号中时候含有历史回迁组
*/
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length()));
String num1=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf(num1.substring(1, num1.length())));
}
} else {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G","")));
String num2=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf((num2.replace("E","").replace("G",""))));
// nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
}
}
}
countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
// countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
countyMapGroup.put("groupNum", createGroupNo(c, nsList));
}
countyMapGroup.put("countyCode", county);
countyMapGroup.put("dealFlag", dealFlag);
......@@ -329,24 +331,27 @@ public class TaskListServiceImpl implements TaskListService {
if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
} else {
List<String> c = new ArrayList<>();
List<String> nsList = new ArrayList<>();
List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) {
/**
* 判断组号中时候含有历史回迁组
*/
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length()));
String str=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf(str.substring(1, str.length())));
}
} else {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add((((countyMapList.get(i)).get("GROUP_NO")) + ""));
String str=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf((str.replace("E","").replace("G",""))));
// nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
}
}
}
countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
// countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
countyMapGroup.put("groupNum", createGroupNo(c, nsList));
}
countyMapGroup.put("countyCode", county);
countyMapGroup.put("dealFlag", dealFlag);
......@@ -1327,41 +1332,73 @@ public class TaskListServiceImpl implements TaskListService {
return taskListMapper.deletePolice(policeCode);
}
private String createGroupNoMiss(List<String> c, List<String> nsList) {
try {
String groupNo = "";
c.add(nsList.get(0));
for (int i = 0; i < nsList.size() - 1; ++i) {
String t = nsList.get(i);
String n = nsList.get(i + 1);
String l = String.valueOf(Integer.parseInt(t.substring(1,8))+1);
String m = n.substring(1,8);
if (l.equals(m)) {
c.add(nsList.get(i + 1));
} else {
if (c.size() >= 1) {
if (c.size() == 1) {
groupNo += c.get(0) + ",";
} else {
groupNo += c.get(0) + "-" + c.get(c.size() - 1) + ",";
}
// private String createGroupNoMiss(List<String> c, List<String> nsList) {
// try {
// String groupNo = "";
// c.add(nsList.get(0));
// for (int i = 0; i < nsList.size() - 1; ++i) {
// String t = nsList.get(i);
// String n = nsList.get(i + 1);
// String l = String.valueOf(Integer.parseInt(t.substring(1,7))+1);
//
// String m = String.valueOf(Integer.parseInt(n.substring(1,7)+1));
// if (l.equals(m)) {
// c.add(nsList.get(i + 1));
// } else {
// if (c.size() >= 1) {
// if (c.size() == 1) {
// groupNo += c.get(0) + ",";
// } else {
// groupNo += c.get(0) + "-" + c.get(c.size() - 1) + ",";
// }
// }
// c.clear();
// c.add(nsList.get(i + 1));
// }
// }
// if (c.size() >= 1) {
// if (c.size() == 1) {
// groupNo += c.get(0) + ",";
// } else {
// groupNo += c.get(0) + "-" + c.get(c.size() - 1) + ",";
// }
// }
// return groupNo;
// } catch (Exception e) {
// }
// return "";
// }
private String createGroupNo(List<Integer> c, List<Integer> nsList) {
try {
String groupNo = "";
c.add(nsList.get(0));
for (int i = 0; i < nsList.size() - 1; ++i) {
if (nsList.get(i) + 1 == nsList.get(i + 1)) {
c.add(nsList.get(i + 1));
} else {
if (c.size() >= 1) {
if (c.size() == 1) {
groupNo += c.get(0) + ",";
} else {
groupNo += c.get(0) + "-" + c.get(c.size() - 1) + ",";
}
c.clear();
c.add(nsList.get(i + 1));
}
c.clear();
c.add(nsList.get(i + 1));
}
if (c.size() >= 1) {
if (c.size() == 1) {
groupNo += c.get(0) + ",";
} else {
groupNo += c.get(0) + "-" + c.get(c.size() - 1) + ",";
}
}
if (c.size() >= 1) {
if (c.size() == 1) {
groupNo += c.get(0) + ",";
} else {
groupNo += c.get(0) + "-" + c.get(c.size() - 1) + ",";
}
return groupNo;
} catch (Exception e) {
}
return "";
return groupNo;
} catch (Exception e) {
}
return "";
}
private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) {
......@@ -1431,24 +1468,27 @@ public class TaskListServiceImpl implements TaskListService {
if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
} else {
List<String> c = new ArrayList<>();
List<String> nsList = new ArrayList<>();
List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) {
/**
* 判断组号中时候含有历史回迁组
*/
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length()));
String num=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf(num.substring(1, num.length())));
}
} else {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G","")));
String num=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf((num.replace("E","").replace("G",""))));
// nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
}
}
}
countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
// countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
countyMapGroup.put("groupNum", createGroupNo(c, nsList));
}
countyMapGroup.put("faileCount", faileCount);
countyMapGroup.put("specialCount", specialCount);
......@@ -1544,24 +1584,27 @@ public class TaskListServiceImpl implements TaskListService {
if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
} else {
List<String> c = new ArrayList<>();
List<String> nsList = new ArrayList<>();
List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) {
/**
* 判断组号中时候含有历史回迁组
*/
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length()));
String num=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf(num.substring(1, num.length())));
}
} else {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G","")));
String num=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf((num.replace("E","").replace("G",""))));
// nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
}
}
}
countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
// countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
countyMapGroup.put("groupNum", createGroupNo(c, nsList));
}
countyMapGroup.put("faileCount", faileCount);
countyMapGroup.put("specialCount", specialCount);
......@@ -1660,24 +1703,27 @@ public class TaskListServiceImpl implements TaskListService {
if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
} else {
List<String> c = new ArrayList<>();
List<String> nsList = new ArrayList<>();
List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) {
/**
* 判断组号中时候含有历史回迁组
*/
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length()));
String num=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf(num.substring(1, num.length())));
}
} else {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G","")));
String num=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf((num.replace("E","").replace("G",""))));
// nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
}
}
}
countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
// countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
countyMapGroup.put("groupNum", createGroupNo(c, nsList));
}
countyMapGroup.put("faileCount", faileCount);
countyMapGroup.put("specialCount", specialCount);
......@@ -1769,24 +1815,27 @@ public class TaskListServiceImpl implements TaskListService {
if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
} else {
List<String> c = new ArrayList<>();
List<String> nsList = new ArrayList<>();
List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) {
/**
* 判断组号中时候含有历史回迁组
*/
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length()));
String num=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf(num.substring(1, num.length())));
}
} else {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G","")));
String num=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf((num.replace("E","").replace("G",""))));
// nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
}
}
}
countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
// countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
countyMapGroup.put("groupNum", createGroupNo(c, nsList));
}
countyMapGroup.put("specialCount", specialCount);
countyMapGroup.put("countyCode", countyCode);
......@@ -1874,24 +1923,27 @@ public class TaskListServiceImpl implements TaskListService {
if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
} else {
List<String> c = new ArrayList<>();
List<String> nsList = new ArrayList<>();
List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) {
/**
* 判断组号中时候含有历史回迁组
*/
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length()));
String num=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf(num.substring(1, num.length())));
}
} else {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G","")));
//nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
String num=(countyMapList.get(i)).get("GROUP_NO").toString();
nsList.add(Integer.valueOf((num.replace("E","").replace("G",""))));
// nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
}
}
}
countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
// countyMapGroup.put("groupNum", createGroupNoMiss(c, nsList));
countyMapGroup.put("groupNum", createGroupNo(c, nsList));
}
countyMapGroup.put("specialCount", specialCount);
countyMapGroup.put("countyCode", countyCode);
......
src/main/resources/application.yml
View file @ 571b5508
server:
port: 8082
#spring相关
#spring相关+
spring:
datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.10.65:1521:yingxin
url: jdbc:oracle:thin:@192.168.1.16:1521:yingxin
username: yingxinyd
password: yingxinyd
servlet:
......
src/main/resources/static/views/queryQualityCheckReport/queryQualityCheckReport.html
View file @ 571b5508
......@@ -46,16 +46,6 @@
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>数量</td>
</tr>
</thead>
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 571b5508
......@@ -57,7 +57,7 @@
<tbody ng-repeat="task in type.countyList">
<tr>
<td >
<input ng-if="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount&&task.eWriteCount==task.recheckCount)"
<input ng-if="type.typeCode=='100'||(task.faileCount==0&&task.countyValidCount==task.eWriteCount)"
type="checkbox" class="checkOneBox"
ng-checked="isSelected(task)" value="{{task.taskId}}"
ng-click="updateSelection($event,task)">
......
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