Commit 7e1c4107 authored by dahai's avatar dahai

确认收到实体证,系统自动生成入库记录,为再次交接提供信息

parent 431f6eb2
package com.yxproject.start.api;
import com.yxproject.start.entity.DeliveredFailedInfoEntity;
import com.yxproject.start.entity.DeliveredFailedReasonEntity;
import com.yxproject.start.entity.DeliveredImportDicEntity;
import com.yxproject.start.entity.DeliveredInfoEntity;
import com.yxproject.start.entity.*;
import com.yxproject.start.service.DeliveredService;
import com.yxproject.start.service.DetailReceiptListService;
import com.yxproject.start.service.ReceiptService;
import com.yxproject.start.utils.ReadExcel;
import com.yxproject.start.utils.YXJSONResponse;
import net.sf.json.JSONArray;
......@@ -44,6 +43,11 @@ public class DeliveredApi {
@Autowired
private DeliveredService deliveredService;
@Autowired
private DetailReceiptListService detailReceiptListService;
@Autowired
private ReceiptService receiptService;
/**
* 导入妥投信息表
......@@ -219,18 +223,30 @@ public class DeliveredApi {
*/
@RequestMapping("acceptDeliveredFailed")
// @RequiresPermissions("userInfo.add")//权限管理;
@Transactional(rollbackFor = Exception.class)
public boolean acceptDeliveredFailed(@RequestBody String json) {
JSONObject jsonObject = JSONObject.fromObject(json);
JSONArray jsonArray = (JSONArray) jsonObject.get("cardIdList");
String name = jsonObject.getString("name")+"";
List<String> list = (List<String>) jsonArray;
for (String cardId:list){
//todo 确认接收妥投失败证件
//更改妥投失败证件状态
//查询出对应详单信息
//生成新的交接单信息
//更改对应的详单信息
List<DetailReceiptListEntity> detailReceiptListEntityList = detailReceiptListService.selectDetailReceiptListEntityByCardId(cardId);
if (detailReceiptListEntityList.size()>0){
//生成新的交接单信息
ReceiptListEntity receiptListEntity = new ReceiptListEntity();
DetailReceiptListEntity detailReceiptListEntity = detailReceiptListEntityList.get(0);
receiptListEntity.setPoliceCode(detailReceiptListEntity.getUploadNo().substring(0,9));
receiptListEntity.setQrCode(detailReceiptListEntity.getAcceptNo());
receiptListEntity.setFinishCount((long)1);
receiptListEntity.setState((long)1);
receiptListEntity.setCheckName(name);
receiptListEntity.setCardTypeId((long)0);
long id = receiptService.saveReceiptList(receiptListEntity);
//更改对应的详单信息
detailReceiptListService.updateDetailReceiptList(detailReceiptListEntity,id);
}
}
return true;
}
......
package com.yxproject.start.mapper;
import com.yxproject.start.entity.DetailReceiptListEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List;
import java.util.Map;
......@@ -25,4 +28,18 @@ public interface DetailReceiptListMapper {
"where to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') =#{date}")
public List<Map<String,Object>> selectPostDetails(String date);
/**
* 查询详单信息
* @param cardId 身份证件号码
* @return
*/
@Select("select * from DETAIL_RECEIPT_LIST where CARD_ID = #{cardId} order by id desc")
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardId);
/**
* 更新详单信息的交接单Id
* @return
*/
@Update("UPDATE DETAIL_RECEIPT_LIST set RECEIPT_ID = #{reciptId} where id =#{id}")
public boolean updateDetailReceiptList(@Param("id")long id, @Param("reciptId")long reciptId);
}
......@@ -59,6 +59,19 @@ public interface ReceiptMapper {
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
public long createReceiptList(ReceiptListEntity receiptListEntity);
//生成交接单
@Insert("<script>" +
" INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID,CHECK_NAME,CHECK_date,RECEIPT_DATE" +
"<if test ='oldCardTypeId !=null'> " +
",OLD_CARD_TYPE_ID" +
"</if> " +
")VALUES(#{qrCode},#{policeCode},#{finishCount},#{state},#{cardTypeId},#{checkName},sysdate,sysdate" +
"<if test ='oldCardTypeId !=null'> " +
",#{oldCardTypeId}" +
"</if> " +
") </script>")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
public long saveReceiptList(ReceiptListEntity receiptListEntity);
//根据身份证号查询交接单详单信息
@Select("select prod_card_t.upload_no," +
"PROD_CARD_T.ACCEPT_NO," +
......
package com.yxproject.start.service;
import com.yxproject.start.entity.DetailReceiptListEntity;
import java.util.List;
import java.util.Map;
......@@ -9,4 +11,8 @@ import java.util.Map;
*/
public interface DetailReceiptListService {
public List<Map<String,Object>> selectPostDetails(String date);
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID);
public boolean updateDetailReceiptList(DetailReceiptListEntity detailReceiptListEntity,long reciptId);
}
......@@ -78,4 +78,6 @@ public interface ReceiptService {
public List<DetailReceiptListEntity> queryReceipt( String acceptNo);
public long saveReceiptList(ReceiptListEntity receiptListEntity);
}
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.DetailReceiptListEntity;
import com.yxproject.start.mapper.DetailReceiptListMapper;
import com.yxproject.start.service.DetailReceiptListService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -21,4 +22,14 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService {
public List<Map<String, Object>> selectPostDetails(String date) {
return detailReceiptListMapper.selectPostDetails(date);
}
@Override
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID) {
return detailReceiptListMapper.selectDetailReceiptListEntityByCardId(cardID);
}
@Override
public boolean updateDetailReceiptList(DetailReceiptListEntity detailReceiptListEntity,long reciptId) {
return detailReceiptListMapper.updateDetailReceiptList(detailReceiptListEntity.getId(),reciptId);
}
}
......@@ -261,6 +261,12 @@ public class ReceiptServiceImpl implements ReceiptService {
return receiptMapper.queryReceipt(acceptNo);
}
@Override
public long saveReceiptList(ReceiptListEntity receiptListEntity) {
receiptMapper.saveReceiptList(receiptListEntity);
return receiptListEntity.getId();
}
private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) {
Map<String, Object> typeMap = new LinkedHashMap<>();
for (Map o : maplist) {
......
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