结算单生成问题

src/main/java/com/ydtech/modules/fnc/controller/InsPlySettleController.java

@@ -64,12 +64,12 @@ public class InsPlySettleController extends BaseController {
      */
     @ApiOperation(value = "[2]结算单生成页面--结算单生成")
     @PostMapping("/generateSettle")
-    public HttpResult generateSettleAndDetail(@RequestBody List<InsPlyIncome> plyList){
+    public HttpResult generateSettleAndDetail(@RequestBody List<String> plyNoList){
 
         HttpResult result = null;
         try {
 
-            result = insPlySettleService.generateSettleAndDetail(plyList);
+            result = insPlySettleService.generateSettleAndDetail(plyNoList);
         } catch (Exception e) {
             result = HttpResult.error("结算单生成失败！"+e.getMessage());
             e.printStackTrace();

src/main/java/com/ydtech/modules/fnc/service/InsPlySettleService.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 public interface InsPlySettleService extends IService<InsPlySettle> {
 
-    public HttpResult generateSettleAndDetail(List<InsPlyIncome> plyList);
+    public HttpResult generateSettleAndDetail(List<String> plyNoList);
 
     public HttpResult<BasePageResult<InsPlySettle>> selectSettle(InsPlySettleVo insPlySettle);
 

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlySettleServiceImpl.java

@@ -53,19 +53,20 @@ public class InsPlySettleServiceImpl extends ServiceImpl<InsPlySettleMapper, Ins
     private InsPlySettleHxMapper insPlySettleHxMapper;
     @Override
     @Transactional
-    public HttpResult generateSettleAndDetail(List<InsPlyIncome> plyList) {
+    public HttpResult generateSettleAndDetail(List<String> plyNoList) {
 
         String settleno = "";
         BigDecimal commissionFeevalue=new BigDecimal(0);
         BigDecimal otherFeevalue=new BigDecimal(0);
         BigDecimal allFeeValue=new BigDecimal(0);
-        if(plyList==null || plyList.size()==0){
+        if(plyNoList==null || plyNoList.size()==0){
             return HttpResult.error("结算清单不能传空");
         }
         // 生成结算单号
-        settleno = plyList.get(0).getCompanyId()+ DateUtil.yyyyMMddHHmmss(new Date());
-        for(InsPlyIncome insPlyIncome_tmp:plyList){
-            InsPlyIncome insPlyIncome=insPlyIncomeMapper.selectByPlyno(insPlyIncome_tmp.getPolicyno());
+        InsPlyIncome insPlyIncome_t=insPlyIncomeMapper.selectByPlyno(plyNoList.get(0));
+        settleno = insPlyIncome_t.getCompanyId()+ DateUtil.yyyyMMddHHmmss(new Date());
+        for(String plyNo:plyNoList){
+            InsPlyIncome insPlyIncome=insPlyIncomeMapper.selectByPlyno(plyNo);
             InsPlySettleDetail insPlySettleDetail =new InsPlySettleDetail();
             insPlySettleDetail.setSettleno(settleno);
             insPlySettleDetail.setOrderno(insPlyIncome.getOrderno());
@@ -86,9 +87,9 @@ public class InsPlySettleServiceImpl extends ServiceImpl<InsPlySettleMapper, Ins
         }
         InsPlySettle insPlySettle =new InsPlySettle();
         insPlySettle.setSettleno(settleno);
-        insPlySettle.setCompanyId(plyList.get(0).getCompanyId());
-        insPlySettle.setDeptId(plyList.get(0).getDeptId());
-        insPlySettle.setSettleMonth(YearMonth.from(plyList.get(0).getPayDate()).toString());
+        insPlySettle.setCompanyId(insPlyIncome_t.getCompanyId());
+        insPlySettle.setDeptId(insPlyIncome_t.getDeptId());
+        insPlySettle.setSettleMonth(YearMonth.from(insPlyIncome_t.getPayDate()).toString());
         String settleBatch =this.baseMapper.getMaxBatch(insPlySettle);
         if(StringUtils.isNullOrEmpty(settleBatch)){
             settleBatch="1";