push

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

@@ -33,21 +33,23 @@ public interface DataAuditingMapper {
     public List<Map<String, Object>> selectDataAuditingEntity(@Param("groupNo") String groupNo);
 
     @Select("<script>" +
-            "select nvl(GAJG_DM.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" +
-            "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 " +
-            "left join GAJG_DM on GAJG_DM.GAJG_DM = DATA_AUDITING.POLICE_SUBSTATION\n" +
+            "select nvl(DIC.unit_name,'000000000') GAJG_MC,DATA_AUDITING.POLICE_SUBSTATION,\n" +
+            "sum(DATA_AUDITING.VALID_COUNT) VALID_COUNT, sum(DATA_AUDITING.INVALID_COUNT) inVALID_COUNT,\n" +
+            "to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd') SUBMIT_DATE,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\n" +
+            "from DATA_AUDITING left join TASK on TASK.TASK_ID = DATA_AUDITING.TASK_ID left join CARD_TYPE_DIC \n" +
+            "on CARD_TYPE_DIC.CARD_TYPE_ID = TASK.CARD_TYPE\n" +
+            "left join DIC_UPLOAD_UNIT_t@ACCuYD_LINK DIC\n" +
+            "on substr(DIC.upload_unit_no,1,9) = substr(DATA_AUDITING.POLICE_SUBSTATION,1,9) \n" +
             "where 1=1 " +
             " <if test = 'policeName != null' >" +
-            " and GAJG_DM.GAJG_MC like ${policeName}" +
+            " and DIC.unit_name like ${policeName}" +
             "</if>\n" +
             " <if test = 'policeCode != null' >" +
             " and DATA_AUDITING.POLICE_SUBSTATION like ${policeCode}" +
             "</if> " +
             " and to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd') BETWEEN ${startDate} and ${endDate} \n" +
-            "group by nvl(GAJG_DM.GAJG_MC,'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.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" +
             "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);

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

@@ -130,17 +130,19 @@ public interface FailedCardMapper {
     @Insert("insert into group_no (GROUP_NO,TASK_ID,VALID_COUNT,INVALID_COUNT)values(#{GROUP_NO},#{TASK_ID},#{VALID_COUNT},#{INVALID_COUNT})")
     public boolean insertGroupNo(@Param("GROUP_NO") String GROUP_NO, @Param("TASK_ID") String TASK_ID, @Param("VALID_COUNT") long VALID_COUNT, @Param("INVALID_COUNT") long INVALID_COUNT);
 
-    @Update("update FAILED_CARD set PRINT_DATE =sysdate ,state =${state} where FAILED_CARD_ID = ${failedCardId}")
+    @Update("update FAILED_CARD set PRINT_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
     public boolean updateFailedState1(FailedCardEntity failedCardEntity);
 
-    @Update("update FAILED_CARD set POSITION_DATE =sysdate ,state =${state} where FAILED_CARD_ID = ${failedCardId}")
+    @Update("update FAILED_CARD set POSITION_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
     public boolean updateFailedState2(FailedCardEntity failedCardEntity);
 
-    @Update("update FAILED_CARD set ALLOT_DATE =sysdate ,state =${state} where FAILED_CARD_ID = ${failedCardId}")
+    @Update("update FAILED_CARD set ALLOT_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
     public boolean updateFailedState3(FailedCardEntity failedCardEntity);
 
 //    @Update("update FAILED_CARD set FINISH_DATE =sysdate ,state =${state} where FAILED_CARD_ID = ${failedCardId}")
 //    public boolean updateFailedState4(FailedCardEntity failedCardEntity);
+    @Update("update FAILED_CARD set FINISH_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
+    public boolean updateFailedState4(FailedCardEntity failedCardEntity);
 //    @Update("update FAILED_CARD set FINISH_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
 //    public boolean updateFailedState5(FailedCardEntity failedCardEntity);
 

src/main/resources/static/views/addFailed/addFailed.html

@@ -134,7 +134,7 @@
                         </tr>
                         </thead>
                         <tbody>
-                            <tr ng-repeat="item in failedInfo | orderBy:FAILED_CARD_ID">
+                            <tr ng-repeat="item in failedInfo | orderBy:'FAILED_CARD_ID'">
                                 <td>{{$index+1}}</td>
                                 <th>{{item.ACCEPT_NO}}</th>
                                 <td>{{item.CARD_NAME}}</td>

src/main/resources/static/views/report/report.html

@@ -26,9 +26,9 @@
                                         <thead>
                                         <tr>
                                             <th>打印日期</th>
-                                            <th>大批证</th>
-                                            <th>邮寄证</th>
-                                            <th>军人证</th>
+                                            <th>普通证</th>
+                                            <th>港澳</th>
+                                            <th>台湾</th>
                                             <th>快证</th>
                                             <th>废证</th>
                                             <th>合计</th>
@@ -37,9 +37,9 @@
                                         <tbody ng-repeat="item in reportData | orderBy:date">
                                         <tr>
                                             <td>{{item.date}}</td>
-                                            <td>{{item.pu}}</td>
-                                            <td>{{item.you}}</td>
-                                            <td>{{item.jun}}</td>
+                                            <td>{{item.yi}}</td>
+                                            <td>{{item.gangao}}</td>
+                                            <td>{{item.tai}}</td>
                                             <td>{{item.kuai}}</td>
                                             <td>{{item.fei}}</td>
                                             <td style="color: #3c8dbc">{{item.total}}</td>