Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 01f1902a authored by wuzhilong's avatar wuzhilong
Browse files
Options

修改解析条件语句

parent 403eb85e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 104 deletions
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 01f1902a
...@@ -53,7 +53,7 @@ public interface LogMapper { ...@@ -53,7 +53,7 @@ public interface LogMapper {
public boolean insertAnalysisDate(@Param("printDate")String printDate,@Param("fileId")String fileId); public boolean insertAnalysisDate(@Param("printDate")String printDate,@Param("fileId")String fileId);
@Update(" update FILE_NAME_DIC set FILE_NAME_DIC.ANALYSIS_DATE = #{analysisDate},STATE = 1 " + @Update(" update FILE_NAME_DIC set FILE_NAME_DIC.ANALYSIS_DATE = #{analysisDate},STATE = 1 " +
" where file_id IN (SELECT PERSON_POST.file_id FROM PERSON_POST " + " where file_id IN (SELECT DISTINCT PERSON_POST.file_id FROM PERSON_POST " +
" LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH " + " LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH " +
" LEFT JOIN FILES ON FILES.ID=PREPRO_PERSON.FILE_ID " + " LEFT JOIN FILES ON FILES.ID=PREPRO_PERSON.FILE_ID " +
" WHERE TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{printDate} ) ") " WHERE TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{printDate} ) ")
...@@ -199,12 +199,13 @@ public interface LogMapper { ...@@ -199,12 +199,13 @@ public interface LogMapper {
"WHERE PERSON_POST.FILE_ID=#{fileId}") "WHERE PERSON_POST.FILE_ID=#{fileId}")
public List<Map<String,Object>> selectIdData(@Param("fileId")String fileId); public List<Map<String,Object>> selectIdData(@Param("fileId")String fileId);
@Select("select DISTINCT PERSON_POST.FILE_ID AS GK_ID,PREPRO_PERSON.FILE_ID AS XML_ID, PREPRO_PERSON.JMSFZSLH, PREPRO_PERSON.GMSFHM,PREPRO_PERSON.YXQQSRQ,PREPRO_PERSON.YXQJZRQ,PREPRO_PERSON.SSXQDM \n" + @Select("select DISTINCT PERSON_POST.FILE_ID AS GK_ID,PREPRO_PERSON.FILE_ID AS XML_ID, PREPRO_PERSON.JMSFZSLH, PREPRO_PERSON.GMSFHM,PREPRO_PERSON.YXQQSRQ,PREPRO_PERSON.YXQJZRQ,FILES.DWDM SSXQDM \n" +
"FROM PERSON_POST " + "FROM PERSON_POST " +
"LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH \n" + "LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH \n" +
"LEFT JOIN FILES ON FILES.ID = PREPRO_PERSON.FILE_ID \n" + "LEFT JOIN FILES ON FILES.ID = PREPRO_PERSON.FILE_ID \n" +
"WHERE PERSON_POST.STATE1=3") "WHERE PERSON_POST.STATE1=3 " +
public List<Map<String, Object>> selectPersonPostUnanalysis(String uploadDate); "and TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{uploadDate}")
public List<Map<String, Object>> selectPersonPostUnanalysis(@Param("uploadDate")String uploadDate);
//身份数据插入person_post //身份数据插入person_post
@Update("UPDATE PERSON_POST SET ID_CARD=#{cardId},ACCEPT_THE_MATTER=#{issuing},BEGIN_USEFUL_LIFE=#{beginDate},VALID_PERIOD_END=#{endDate},STATE1=0 where PERSON_POST.FIRST_WHITE=#{firstWhite}") @Update("UPDATE PERSON_POST SET ID_CARD=#{cardId},ACCEPT_THE_MATTER=#{issuing},BEGIN_USEFUL_LIFE=#{beginDate},VALID_PERIOD_END=#{endDate},STATE1=0 where PERSON_POST.FIRST_WHITE=#{firstWhite}")
......
src/main/resources/static/dialogs/printReceitp.html deleted 100644 → 0
View file @ 403eb85e
<div class="ui-dialog-title" >
<H1>是否打印出库交接单</H1>
</div>
<div class="ui-dialog-content">
</div>
<div style="text-align: center;">
<p ng-if="wrongMsg!=-1" style="color: red;">{{wrongMsg}}</p>
<button class="btn btn-primary" style="width: 40%" ng-click="printDiv()">确认</button>
<button class="btn btn-danger" style="width: 40%" ng-click="closeThisDialog()">关闭</button>
</div>
<div id="divPrint{{$index}}" ng-repeat="idx in result" >
<!--<div class="title" style="text-align: center;">-->
<!--北京市公安局证件制作管理中心交接岗位<br />-->
<!--身份证交接单</div>-->
<!--<div>交接日期：{{receitpDataToPrint.date}}</div>-->
<!--<div>送至：</div>-->
<table cellpadding="0" cellspacing="0" width="740px" style="text-align: center;" border="1px" ng-show="false" >
<thead>
<tr>
<th width="60">
序号
</th>
<th width="130">
身份证受理组号
</th>
<th colspan="2">
身份证所属派出所名称
</th>
<th width="80">
数量
</th>
<th width="145">
备注
</th>
</tr>
</thead>
<tbody ng-repeat="item in idx.policeList | orderBy:'QR_CODE'">
<tr height="25mm" style="font-size: 11pt;">
<td width="60" >
{{$index+1}}
</td>
<td width="130" style="text-align: center;">
{{item.QR_CODE}}
</td>
<td colspan="2" style="text-align: left;">
{{item.GAJG_MC}}
</td>
<td width="80" style="text-align: center;">
{{item.FINISH_COUNT}}
</td>
<td width="145">
</td>
</tr>
</tbody>
<tfoot>
<tr ng-if="idx.value==0" height="25pt">
<td colspan="2" class="center">
合计
</td>
<td colspan="2">
</td>
<td class= "center" style="text-align: left;padding-left: 7px;">
{{idx.total}}
</td>
<td>
</td>
</tr>
<tr>
<td colspan="3" style="height:26mm;text-align: left;">
<div> 实 发 ：</div>
<br />
<div class="sign">
交付人（签字）：
</div>
<br />
<div class="signdate">
日 期 ：
</div>
</td>
<td colspan="3" style="height:26mm;text-align: left;">
<div> 实 收 ：</div>
<br />
<div class="sign">
接收人（签字）：
</div>
<br />
<div class="signdate">
日 期 ：
</div>
</td>
</tr>
</tfoot>
</table>
</div>
\ No newline at end of file
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