bmstruck完成提交

src/main/java/com/steerinfo/dil/controller/BmstruckCheckController.java

@@ -40,7 +40,7 @@ public class BmstruckCheckController extends BaseRESTfulController {
     @PostMapping("/updateBmstruckCheck")
     public RESTfulResult updateBmstruckCheck(@RequestParam BigDecimal statementId,
                                              @RequestParam Integer status,
-                                             @RequestParam String person) {
+                                             @RequestParam Integer person) {
         int code = bmstruckCheckService.updateBmstruckCheck(statementId, status, person);
         return success(code);
     }

src/main/java/com/steerinfo/dil/controller/BmstruckFormulaController.java

@@ -0,0 +1,47 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.BmstruckFormulaServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/6 17:34
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/bmstruckformulas")
+public class BmstruckFormulaController extends BaseRESTfulController {
+
+    @Autowired
+    BmstruckFormulaServiceImpl bmstruckFormulaService;
+
+    /**
+     * 查询途损费计算公式
+     * @return
+     */
+    @ApiOperation(value = "查询销售汽运离100KM差距10KM内计费公式")
+    @PostMapping("/getSmallTruckFormula")
+    public RESTfulResult getSmallTruckFormula(){
+        return success(bmstruckFormulaService.selectAnyFormula(new BigDecimal(10)));
+    }
+
+    /**
+     * 查询水分质检计算公式
+     * @return
+     */
+    @ApiOperation(value = "查询销售汽运离100KM差距10KM外计费公式")
+    @PostMapping("/getBigTruckFormula")
+    public RESTfulResult getBigTruckFormula(){
+        return success(bmstruckFormulaService.selectAnyFormula(new BigDecimal(11)));
+    }
+}

src/main/java/com/steerinfo/dil/mapper/BmstruckFormulaMapper.java

@@ -3,6 +3,8 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.BmstruckFormula;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
@@ -14,4 +16,11 @@ public interface BmstruckFormulaMapper extends IBaseMapper<BmstruckFormula, BigD
      * @return
      */
     String getTruckFormula(BigDecimal formulaId);
+
+    /**
+     * 查询计费公式和名称
+     * @param formulaId
+     * @return
+     */
+    Map<String, Object> selectAnyFormula(BigDecimal formulaId);
 }

src/main/java/com/steerinfo/dil/service/IBmstruckCheckService.java

@@ -27,5 +27,5 @@ public interface IBmstruckCheckService{
      * @param person
      * @return
      */
-    int updateBmstruckCheck(BigDecimal statementId,Integer status,String person);
+    int updateBmstruckCheck(BigDecimal statementId,Integer status,Integer person);
 }

src/main/java/com/steerinfo/dil/service/IBmstruckFormulaService.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service;
 
 import java.math.BigDecimal;
+import java.util.Map;
 
 /**
  * @Description:
@@ -16,4 +17,11 @@ public interface IBmstruckFormulaService {
      * @return
      */
     String getTruckFormula(BigDecimal formulaId);
-}
+
+    /**
+     * 根据主键查询公式和名称
+     * @param formulaId
+     * @return
+     */
+    Map<String, Object> selectAnyFormula(BigDecimal formulaId);
+}

src/main/java/com/steerinfo/dil/service/impl/BmstruckCheckServiceImpl.java

@@ -40,7 +40,7 @@ public class BmstruckCheckServiceImpl implements IBmstruckCheckService {
      * @return
      */
     @Override
-    public int updateBmstruckCheck(BigDecimal statementId,Integer status,String person) {
+    public int updateBmstruckCheck(BigDecimal statementId,Integer status,Integer person) {
         BigDecimal realStatus = new BigDecimal(status);
         Map<String,Object> map = new HashMap<>();
         map.put("statementId",statementId);
@@ -48,11 +48,14 @@ public class BmstruckCheckServiceImpl implements IBmstruckCheckService {
         BmstruckCheck bmstruckCheck = bmstruckChecks.get(0);
         bmstruckCheck.setStatementId(statementId);
         switch (person){
-            case "收货客户": bmstruckCheck.setCheckReceiveCustomerStatus(realStatus);
+            //0收货客户
+            case 0: bmstruckCheck.setCheckReceiveCustomerStatus(realStatus);
                 break;
-            case "承运商": bmstruckCheck.setCheckCarrierStatus(realStatus);
+                //1承运商
+            case 1: bmstruckCheck.setCheckCarrierStatus(realStatus);
                 break;
-            case "销售公司": bmstruckCheck.setCheckShipperStatus(realStatus);
+                //销售公司
+            case 2: bmstruckCheck.setCheckShipperStatus(realStatus);
                 break;
         }
         return bmstruckCheckMapper.updateByPrimaryKeySelective(bmstruckCheck);

src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

@@ -74,6 +74,9 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             BigDecimal purchaseOrderId = getFormulaMembers(orderId);
             bmstruckDetailsOrder.setPurchaseOrderId(purchaseOrderId);
         }
+        if (orderType.intValue() == 1) {
+            bmstruckDetailsOrder.setWetherToStatement(new BigDecimal(0));
+        }
         bmstruckDetailsOrder.setDetailsId(detailsId);
         bmstruckDetailsOrder.setOrderId(orderId);
         bmstruckDetailsOrder.setDetailsNo(detailsNo);

src/main/java/com/steerinfo/dil/service/impl/BmstruckFormulaServiceImpl.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Map;
 
 /**
  * @Description:
@@ -28,4 +29,14 @@ public class BmstruckFormulaServiceImpl implements IBmstruckFormulaService {
     public String getTruckFormula(BigDecimal formulaId) {
         return bmstruckFormulaMapper.getTruckFormula(formulaId);
     }
-}
+
+    /**
+     * 根据主键查询公式和名称
+     * @param formulaId
+     * @return
+     */
+    @Override
+    public Map<String, Object> selectAnyFormula(BigDecimal formulaId) {
+        return bmstruckFormulaMapper.selectAnyFormula(formulaId);
+    }
+}

src/main/java/com/steerinfo/dil/service/impl/BmstruckStatementServiceImpl.java

@@ -25,6 +25,7 @@ import java.util.Map;
 
 /**
  * BmstruckStatement服务实现：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2021-10-15 06:20
  * 类描述
@@ -33,8 +34,8 @@ import java.util.Map;
  * 作者：generator
  * 参考：
  * 描述：BmstruckStatement服务实现
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @Service(value = "bmstruckStatementService")
 public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
@@ -52,6 +53,7 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
 
     /**
      * 展示计费账单
+     *
      * @param mapValue
      * @return
      */
@@ -59,33 +61,34 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
     public List<Map<String, Object>> getTruckStatementList(Map<String, Object> mapValue) {
         List<Map<String, Object>> mapList = bmstruckStatementMapper.getTruckStatementList(mapValue);
         String checkStatus = "";
-        for (Map<String,Object> map: mapList ) {
+        for (Map<String, Object> map : mapList) {
             BigDecimal checkCarrierStatus = (BigDecimal) map.get("checkCarrierStatus");
             BigDecimal checkReceiveCustomerStatus = (BigDecimal) map.get("checkReceiveCustomerStatus");
             BigDecimal checkShipperStatus = (BigDecimal) map.get("checkShipperStatus");
             // 有人拒绝：未通过审核
-            if (checkCarrierStatus.intValue() == 0 || checkReceiveCustomerStatus.intValue() == 0 || checkShipperStatus.intValue() == 0){
+            if (checkCarrierStatus.intValue() == 1 || checkReceiveCustomerStatus.intValue() == 1 || checkShipperStatus.intValue() == 1) {
                 checkStatus = "未通过审核";
             }
             // 全部通过：已通过审核
-            if (checkCarrierStatus.intValue() == 1 && checkReceiveCustomerStatus.intValue() == 1 && checkShipperStatus.intValue() == 1) {
+            if (checkCarrierStatus.intValue() == 2 && checkReceiveCustomerStatus.intValue() == 2 && checkShipperStatus.intValue() == 2) {
                 checkStatus = "已通过审核";
             }
             // 有人未审核，且没人拒绝：审核中
-            if (checkCarrierStatus == null || checkReceiveCustomerStatus == null || checkShipperStatus == null && checkStatus != "未通过审批"){
+            if (checkStatus != "未审核通过" && checkCarrierStatus.intValue() == 0 || checkReceiveCustomerStatus.intValue() == 0 || checkShipperStatus.intValue() == 0) {
                 checkStatus = "审核中";
             }
             // 全部都没审核：待审核
-            if (checkCarrierStatus == null && checkReceiveCustomerStatus == null && checkShipperStatus == null) {
+            if (checkCarrierStatus.intValue() == 0 && checkReceiveCustomerStatus.intValue() == 0 && checkShipperStatus.intValue() == 0) {
                 checkStatus = "待审核";
             }
-            map.put("checkStatus",checkStatus);
+            map.put("checkStatus", checkStatus);
         }
         return mapList;
     }
 
     /**
      * 生成汽运账单
+     *
      * @param mapList
      * @return
      */
@@ -100,9 +103,12 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
         BigDecimal checkId = bmstruckCheckMapper.selectCheckId();
         bmstruckCheck.setCheckId(checkId);
         bmstruckCheck.setStatementId(statementId);
+        bmstruckCheck.setCheckCarrierStatus(new BigDecimal(0));
+        bmstruckCheck.setCheckShipperStatus(new BigDecimal(0));
+        bmstruckCheck.setCheckReceiveCustomerStatus(new BigDecimal(0));
         bmstruckCheckMapper.insertSelective(bmstruckCheck);
         // 汽运账单编号
-        String statementNumber = noUtil.setResultNo("QYZD",statementId);
+        String statementNumber = noUtil.setResultNo("QYZD", statementId);
         bmstruckStatement.setStatementNumber(statementNumber);
         // 支付单位
         bmstruckStatement.setStatementPaymentUnit("四川达州钢铁集团有限责任公司");
@@ -115,7 +121,7 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
         bmstruckStatement.setUpdateUsername("admin");
         bmstruckStatement.setInsertUpdateRemark("无");
         Double doubleTotalAmount = new Double(0);
-        for (Map<String,Object> map: mapList ) {
+        for (Map<String, Object> map : mapList) {
             // 中间表主键
             BigDecimal detailsStatementId = bmstruckDetailsStatementMapper.selectDetailsStatementId();
             // 详单id
@@ -133,7 +139,7 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
             bmstruckDetailsStatement.setUpdateTime(new Date());
             bmstruckDetailsStatement.setUpdateUsername("admin");
             bmstruckDetailsStatement.setInsertUpdateRemark("无");
-            BigDecimal detailsAmount = new BigDecimal((Integer)map.get("detailsAmount"));
+            BigDecimal detailsAmount = new BigDecimal((Double) map.get("detailsAmount"));
             Double detailsAmountDouble = Double.valueOf(detailsAmount.toString());
             doubleTotalAmount += detailsAmountDouble;
             bmstruckDetailsStatementMapper.insertSelective(bmstruckDetailsStatement);
@@ -146,6 +152,7 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
 
     /**
      * 展示账单下的详单
+     *
      * @param mapVal
      * @return
      */

src/main/java/com/steerinfo/dil/util/NoUtil.java

@@ -35,12 +35,24 @@ public class NoUtil {
         }
         switch ((resultId.toString()).length()) {
             case 1:
-                resultNo = resultNo + "0000" + resultId;
+                resultNo = resultNo + "00000000" + resultId;
                 break;
             case 2:
-                resultNo = resultNo + "000" + resultId;
+                resultNo = resultNo + "0000000" + resultId;
                 break;
             case 3:
+                resultNo = resultNo + "000000" + resultId;
+                break;
+            case 5:
+                resultNo = resultNo + "00000" + resultId;
+                break;
+            case 6:
+                resultNo = resultNo + "0000" + resultId;
+                break;
+            case 7:
+                resultNo = resultNo + "000" + resultId;
+                break;
+            case 8:
                 resultNo = resultNo + "00" + resultId;
                 break;
             case 4:

src/main/resources/bootstrap.yml

@@ -14,7 +14,7 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:localhost:8038}
 
 #eureka设置
 eureka:

src/main/resources/com/steerinfo/dil/mapper/BmstruckFormulaMapper.xml

@@ -405,4 +405,12 @@
         FROM BMSTRUCK_FORMULA
         WHERE FORMULA_ID = #{formulaId}
     </select>
+
+    <!-- 查询计算公式 -->
+    <select id="selectAnyFormula" resultType="java.util.Map" parameterType="DECIMAL">
+    SELECT bf.FORMULA_NAME   as "formula_name",
+           bf.FORMULA_STRING as "formula_string"
+    FROM BMSTRUCK_FORMULA bf
+    WHERE bf.FORMULA_ID = #{formulaId}
+</select>
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/BmstruckStatementMapper.xml

@@ -522,7 +522,7 @@
         LEFT JOIN BMSTRUCK_DETAILS_STATEMENT bds
         ON bdo.DETAILS_ID = bds.DETAILS_ID
         WHERE bds.STATEMENT_ID = #{statementId}
-        AND bdo.WETHER_TO_STATEMENT = 0
+        AND bdo.WETHER_TO_STATEMENT = 1
         )
         <where>
             <if test="detailsNo!= null">