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

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

@@ -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/resources/application.yml

 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

@@ -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

@@ -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)">