Commit 2cc1455c authored by suichenguang's avatar suichenguang

交接单

parent 9f70318b
......@@ -36,8 +36,10 @@ public class ReceiptApi {
@RequestMapping("createReceiptList")
@Transactional(rollbackFor = Exception.class)
public boolean createReceiptList(@RequestParam("id") String id) {
System.out.println("11111111111111111111111111111111111");
//判断是否是特证
if (receiptService.selectSpecialCardByAcceptNo(id) == 1) {
System.out.println("222222222222222222222222222222222");
//查询这个受理号是否生成了交接单
int countAccept = receiptService.selectCountById(id);
//判断是否生成了交接单
......@@ -73,6 +75,7 @@ public class ReceiptApi {
//已经生成特证交接单,不做操作。
}
} else {
System.out.println("333333333333333333333333333333333333333333333");
//查询交接单所需数据
Map<String, Object> receiptListDate = receiptService.selectReceiptListDate(id);
ReceiptListEntity receiptListEntity = new ReceiptListEntity();
......
......@@ -20,10 +20,8 @@ public interface ReceiptMapper {
"left join group_no on prod_group_t.group_no = group_no.group_no \n"+
"left join task on task.task_id =group_no.task_id\n"+
"left join GAJG_DM on subStr(prod_card_t.UPLOAD_NO,0,9)= GAJG_DM.GAJG_DM\n"+
"where" +
"<if test ='id !=null'> " +
"where " +
" prod_card_t.id_no=#{id}" +
"</if> " +
"")
public Map<String,Object> selectReceiptListDate(String id);
......@@ -115,8 +113,8 @@ public interface ReceiptMapper {
//根据交接单号查详单信息
@Select("select * from detail_receipt_list where receipt=#{receiptId}")
public List<Map<String,Object>> selectDetailList(@Param("receiptId") String receiptId);
@Select("select * from detail_receipt_list where receipt_id=#{receiptId}")
public Map<String,Object> selectDetailList(@Param("receiptId") String receiptId);
//根据传入的交接单ID和复核人ID插入复核人、复核时间
......@@ -151,12 +149,8 @@ public interface ReceiptMapper {
"WHERE subStr(ACCEPT_NO,0,8) = #{groupNo} or ACCEPT_NO=#{groupNo}")
public Map<String,Object> selectCountTime(@Param("groupNo") String groupNo);
@Select("select \n" +
"prod_trace_t.DOWNLOAD_DATE as downloadDate,\n" +
"prod_trace_t.CHECK_DATE as checkDate,\n" +
"prod_trace_t.ELECTRIC_WRITE_DATE as electricDate\n" +
"from prod_trace_t@PROD_LINK \n" +
"WHERE subStr(ACCEPT_NO,0,8) = #{groupNo} or ACCEPT_NO=#{groupNo}")
@Select("select * from DETAIL_RECEIPT_LIST\n" +
"WHERE RECEIPT_ID = #{groupNo}")
public Map<String,Object> selectTimes(@Param("groupNo") String groupNo);
@Select("select RECEIPT_LIST.id,RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.POLICE_CODE,decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID) CARD_TYPE_ID,\n" +
......
......@@ -71,8 +71,8 @@ public class ReceiptServiceImpl implements ReceiptService {
}
@Override
public List<Map<String, Object>> selectDetailList(String receiptId) {
List<Map<String, Object>> resultList = receiptMapper.selectDetailList(receiptId);
public Map<String, Object> selectDetailList(String receiptId) {
Map<String, Object> resultList = receiptMapper.selectDetailList(receiptId);
return resultList;
}
......@@ -131,7 +131,7 @@ public class ReceiptServiceImpl implements ReceiptService {
@Override
public Map<String, Object> selectTimes(String groupNo) {
Map<String, Object> maps = receiptMapper.selectTimes(groupNo);
Map<String, Object> maps = receiptMapper.selectTimes(groupNo);
return maps;
}
......
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