1.结算bug调整4.0

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

@@ -292,6 +292,13 @@ public class InsPlyIncomeController extends BaseController {
         return HttpResult.ok("修改成功");
     }
 
+    @PutMapping("/updateNoHand")
+    @ApiModelProperty(value = "修改")
+    public HttpResult<Object> updateNoHand(@RequestBody InsPlyIncomeVo insPlyIncomeVo) {
+        insPlyIncomeService.updateNoHand(insPlyIncomeVo);
+        return HttpResult.ok("修改成功");
+    }
+
     @PutMapping("/batchUpdate")
     @ApiModelProperty(value = "批量修改")
     public HttpResult<Object> batchUpdate(@RequestBody InsPlyIncomeVo insPlyIncomeVo) {

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

@@ -152,4 +152,7 @@ public interface InsPlyIncomeService extends IService<InsPlyIncome> {
      * @return   InsPlyIncome
      */
     HttpResult<InsPlyIncome> ptInsert(InsPlyIncomeVo insPlyIncomeVo);
+
+    void updateNoHand(InsPlyIncomeVo insPlyIncomeVo);
+
 }

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

@@ -1186,12 +1186,28 @@ handlingProportion,
         InsPlyIncome insPlyIncome = new InsPlyIncome();
         BeanUtils.copyProperties(insPlyIncomeVo, insPlyIncome);
         this.amountCalculate(insPlyIncomeVo, insPlyIncome);
+        insPlyIncome.setUpdateUserId(BaseController.getUser().getId());
         baseMapper.updateById(insPlyIncome);
         insPlyIncomeVo.setCrudStatus("2");
         this.saveLog(insPlyIncomeVo);
 
     }
 
+    @Override
+    public void updateNoHand(InsPlyIncomeVo insPlyIncomeVo) {
+        //        根据协议   如果是含增值税结算   用保费 *   如果是  不含税保费
+        InsPlyIncome insPlyIncome = new InsPlyIncome();
+        BeanUtils.copyProperties(insPlyIncomeVo, insPlyIncome);
+        insPlyIncome.setCommissionFeevalue(insPlyIncomeVo.getNoSuperviseCostsPremiums());
+        insPlyIncome.setCommissionFeerate(insPlyIncomeVo.getNoSuperviseCostsProportion());
+        insPlyIncome.setUpdateUserId(BaseController.getUser().getId());
+        baseMapper.updateById(insPlyIncome);
+        insPlyIncomeVo.setOtherFeevalue(insPlyIncomeVo.getNoSuperviseCostsPremiums());
+
+        insPlyIncomeVo.setCrudStatus("2");
+        this.saveLog(insPlyIncomeVo);
+    }
+
     /**
      * @param insPlyIncomeVo
      * @param insPlyIncome   重新计算金额  通过比例
@@ -1213,28 +1229,29 @@ handlingProportion,
             insPlyIncome.setCommissionFeerate(this.calculateTotal(jqSuperviseCostsProportion, sySuperviseCostsProportion,
              noSuperviseCostsProportion));  //手续费比例 = 商业手续费比例 +  交强手续费比例 + 非车手续费比例
             if (jqSuperviseCostsProportion != null && jqPremium != null) {
-                insPlyIncome.setJqSuperviseCostsPremiums(this.algorithmAmount(jqPremium, jqSuperviseCostsProportion));  //交强手续费
+                insPlyIncome.setJqSuperviseCostsPremiums(getBigDecimal(jqPremium, jqSuperviseCostsProportion));  //交强手续费
                 insPlyIncome.setJqSuperviseCostsProportion(jqSuperviseCostsProportion);
 
             }
             if (sySuperviseCostsProportion != null && syPremium != null) {
-                insPlyIncome.setSySuperviseCostsPremiums(this.algorithmAmount(syPremium, sySuperviseCostsProportion)); //商业手续费
+                insPlyIncome.setSySuperviseCostsPremiums(getBigDecimal(syPremium, sySuperviseCostsProportion)); //商业手续费
                 insPlyIncome.setSySuperviseCostsProportion(sySuperviseCostsProportion);
             }
             if (noSuperviseCostsProportion != null && noPremium != null) {
-                insPlyIncome.setNoSuperviseCostsPremiums(this.algorithmAmount(noPremium, noSuperviseCostsProportion));  //非车手续费
+                insPlyIncome.setNoSuperviseCostsPremiums(getBigDecimal(noPremium, noSuperviseCostsProportion));  //非车手续费
                 insPlyIncome.setNoSuperviseCostsProportion(noSuperviseCostsProportion);
             }
             if (jqOtherCostsProportion != null && jqPremium != null) {
                 insPlyIncome.setJqOtherCostsPremium(this.algorithmAmount(jqPremium, jqOtherCostsProportion));    //交强跟单费
+                insPlyIncome.setJqOtherCostsPremium(getBigDecimal(jqPremium, jqOtherCostsProportion));    //交强跟单费
                 insPlyIncome.setJqOtherCostsProportion(jqOtherCostsProportion);
             }
             if (syOtherCostsProportion != null && syPremium != null) {
-                insPlyIncome.setSyOtherCostsPremium(this.algorithmAmount(syPremium, syOtherCostsProportion));  //商业跟单费
+                insPlyIncome.setSyOtherCostsPremium(getBigDecimal(syPremium, syOtherCostsProportion));  //商业跟单费
                 insPlyIncome.setSyOtherCostsProportion(syOtherCostsProportion);
             }
             if (noOtherCostsProportion != null && noPremium != null) {
-                insPlyIncome.setNoOtherCostsPremium(this.algorithmAmount(noPremium, noOtherCostsProportion));   //非车跟单费
+                insPlyIncome.setNoOtherCostsPremium(getBigDecimal(noPremium, noOtherCostsProportion));   //非车跟单费
                 insPlyIncome.setNoOtherCostsProportion(noOtherCostsProportion);
             }
             insPlyIncome.setCommissionFeevalue(this.calculateTotal(insPlyIncome.getJqSuperviseCostsPremiums(), insPlyIncome.getSySuperviseCostsPremiums(), insPlyIncome.getNoSuperviseCostsPremiums())); //手续费
@@ -2296,7 +2313,6 @@ handlingProportion,
     public InsPlyIncome ptTotalAmount(InsPlyIncomeVo insPlyIncomeVo) {
         HashMap<String, Object> params = new HashMap<>();
         params = this.saveParams(insPlyIncomeVo, params);
-        params.remove("handlingFeesStatus");
         InsPlyIncome totalledAmount = baseMapper.ptTotalAmount(params);  //总金额
         return totalledAmount;
     }
@@ -2702,9 +2718,16 @@ handlingProportion,
             insPlyIncome.setCompanyName(name);
         }
         insPlyIncome.setCreateTime(LocalDate.now());
-        insPlyIncomeVo.setAgreementType("1");
+        insPlyIncome.setAgreementType("1");
+        insPlyIncome.setHandlingFeesStatus("0");
+        insPlyIncome.setIsNotCar("0");
+        insPlyIncome.setIsNotDocumentary("0");
+        insPlyIncome.setDocumentaryFeesStatus("0");
+        insPlyIncome.setAllFeeValue(insPlyIncome.getReceivableAmount());
         baseMapper.insert(insPlyIncome);
         return HttpResult.ok();
     }
 
+
+
 }

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

@@ -209,6 +209,7 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
             wrapper.set(InsPlyIncome::getHandlingFeesStatus, "0");
             wrapper.set(InsPlyIncome::getTaskId, null);
             wrapper.set(InsPlyIncome::getSettlementUserId, null);
+            wrapper.set(InsPlyIncome::getSettlementTime, null);
             insPlyIncomeMapper.update(item, wrapper);
         }
 

src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -200,10 +200,7 @@ public class InsPlyIncomeVo implements Serializable {
     @ApiModelProperty("应收金额")
     private BigDecimal allFeeValue;
 
-    @ApiModelProperty(value = "签单结束日期")
-    private String signDateEnd;
-    @ApiModelProperty(value = "签单开始日期")
-    private String signDateStart;
+
 
     @ApiModelProperty("交强险含税保费")
     private BigDecimal jqPremium;
@@ -367,6 +364,24 @@ public class InsPlyIncomeVo implements Serializable {
     @ApiModelProperty("已开票未结算")
     private BigDecimal  invoicedNotSettledAmount;
 
+    @ApiModelProperty(value = "签单结束日期")
+    private String signDateEnd;
+    @ApiModelProperty(value = "签单开始日期")
+    private String signDateStart;
+
+    @ApiModelProperty("非车手续费")
+    private BigDecimal noSuperviseCostsPremiums;
+
+
+    @ApiModelProperty("交强应收比例")
+    private BigDecimal jqReceivableProportion;
+
+    @ApiModelProperty("商业应收比例")
+    private BigDecimal syReceivableProportion;
+
+
+    @ApiModelProperty("非车应收比例")
+    private BigDecimal noReceivableProportion;
 
 
 

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -58,7 +58,6 @@
         <result column="settlement_time" property="settlementTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="settlement_user_id" property="settlementUserId"/>
-        <result column="update_user_id" property="updateUserId"/>
         <result column="jq_other_costs_premium" property="jqOtherCostsPremium"/>
         <result column="sy_other_costs_premium" property="syOtherCostsPremium"/>
         <result column="no_other_costs_premium" property="noOtherCostsPremium"/>
@@ -152,12 +151,13 @@
                 a.invoicing_method  as  "invoicingMethod",
                 a.settlement_image_id as "settlementUserName",
                 a.task_id as "taskId",
-                su1.name as "taskId",
                 a.create_time  as  "createTime"
     </sql>
 
     <select id="queryNew"  resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">
         select
+        su1.name as "settlementUserName",
+        su2.name as "updateUserName",
         pa.agreement_name  as "agreementName",
         pa.agreement_type  as "agreementType",
         pa.docking_person  as "dockingPerson",
@@ -169,6 +169,7 @@
         LEFT  JOIN  ptl_agreement  pa  on  a.agreement_id  = pa.id
         LEFT  JOIN  sys_user   su  on su.id=a.user_id
         LEFT  JOIN  sys_user   su1  on su1.id=a.settlement_user_id
+        LEFT  JOIN  sys_user   su2  on su2.id=a.update_user_id
         LEFT  JOIN   ins_upload_files  upf   on  a.settlement_image_id=upf.id
         LEFT  JOIN   esm_ins_company  eic   on  eic.id=a.partner_companies_id
         LEFT  JOIN   sys_dept b on pa.dept_id=b.id