update

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costplan/AbstractCostPlanService.java

 package com.blt.other.module.cost.service.impl.costplan;
 
 import com.bailuntec.cost.api.dto.CostPlanDto;
+import com.blt.other.common.util.PathUtil;
 import com.blt.other.module.auth.dao.UserDao;
 import com.blt.other.module.cost.dao.*;
 import com.blt.other.module.cost.dto.CostPlanApiDto;
 import com.blt.other.module.cost.service.*;
+import com.blt.other.module.cost.utils.CostFileUtil;
 import com.blt.other.module.cost.utils.CostUtils;
 import com.blt.other.module.database.model.*;
 import com.github.pagehelper.PageHelper;
@@ -92,6 +94,16 @@ public abstract class AbstractCostPlanService implements CostPlanService {
         costPlanDomain.setKindName(costTypeKindDomain.getKindName());
         costPlanDomain.setTypeNo(costTypeKindDomain.getTypeNo());
         costPlanDomain.setTypeName(costTypeKindDomain.getTypeName());
+
+        /*附件字段*/
+        if (costPlanDomain.getFileSelect() != null) {
+            // 文件上传的路径
+            String filePath = PathUtil.getBasePath() + PathUtil.getPath("cost/" + costPlanDomain.getCostPlanNo() + "/");
+            // 调用工具类执行保存，并返回 path
+            String path = CostFileUtil.upload(costPlanDomain.getFileSelect(), filePath);
+            costPlanDomain.setFilePath(path);
+        }
+
     }
 
     @Override

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costplan/CostPlanNewLend1ServiceImpl.java

@@ -27,6 +27,7 @@ public class CostPlanNewLend1ServiceImpl extends AbstractCostPlanService impleme
         this.doSaveFinansyRecord(planDomain);
         this.completedCostPlan(planDomain);
         planDomain.setCostPlanStatus(0);
+        planDomain.setLendStatus(1);
         costPlanDao.insert(planDomain);
     }
 

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costplan/CostPlanNewLend2ServiceImpl.java

@@ -159,7 +159,7 @@ public class CostPlanNewLend2ServiceImpl extends AbstractCostPlanService impleme
                 payPlan.setKindNo(null);
                 payPlan.setCostReason("借支差额：" + payPlan.getSupCostNo());
                 Integer insert2 = costPlanDao.insert(payPlan);
-                if (null != insert2 && insert2 == 1) {
+                if (insert2 == 1) {
                     log.info("生成一张补差额的付款单计划：" + payPlan);
                     // 生成空子类的子项目
                     CostPlanTempDomain temp = new CostPlanTempDomain();

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/CostPlanTempServiceImpl.java → bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costplan/CostPlanTempServiceImpl.java

-package com.blt.other.module.cost.service.impl;
+package com.blt.other.module.cost.service.impl.costplan;
 
 import com.bailuntec.cost.api.dto.CostPlanTempDto;
 import com.blt.other.common.util.CurUtils;

bailuntec-cost-core/src/main/resources/mapper/UserCostFinansysMapper.xml

@@ -4,73 +4,50 @@
 <mapper namespace="com.blt.other.module.cost.dao.UserCostFinansysDao">
 
     <insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO
-        user_cost_finansys(
-        userid,username,useraccount,usercode,bank_name,bank_card,bank_card_user,user_cost_finansys_no,bank_company,sync_id
-        )
+        INSERT INTO user_cost_finansys(userid, username, useraccount, usercode, bank_name, bank_card, bank_card_user,
+                                       user_cost_finansys_no, bank_company, sync_id)
             VALUE
             (
-        #{userid},#{username},#{useraccount},#{usercode},#{bankName},#{bankCard},#{bankCardUser},#{userCostFinansysNo},#{bankCompany},#{syncId}
+             #{userid}, #{username}, #{useraccount}, #{usercode}, #{bankName}, #{bankCard}, #{bankCardUser},
+             #{userCostFinansysNo}, #{bankCompany}, #{syncId}
                 )
     </insert>
 
     <select id="selectByNo" resultType="com.blt.other.module.database.model.UserCostFinansysDomain">
-        SELECT
-        *
-        FROM
-        user_cost_finansys
-        WHERE
-        user_cost_finansys_no = #{userCostFinansysNo}
+        SELECT *
+        FROM user_cost_finansys
+        WHERE user_cost_finansys_no = #{userCostFinansysNo}
     </select>
 
     <select id="selectByUsercode" resultType="com.blt.other.module.database.model.UserCostFinansysDomain">
-        SELECT
-        *
-        FROM
-        user_cost_finansys
-        WHERE
-        usercode = #{usercode}
-        ORDER BY
-        id DESC
+        SELECT *
+        FROM user_cost_finansys
+        WHERE usercode = #{usercode}
+        ORDER BY id DESC
     </select>
 
     <select id="selectByDetail" resultType="com.blt.other.module.database.model.UserCostFinansysDomain">
-        SELECT
-        *
-        FROM
-        user_cost_finansys
-        WHERE
-        bank_name = #{bankName}
-        AND
-        bank_card = #{bankCard}
-        AND
-        bank_card_user = #{bankCardUser}
-        AND
-        bank_company = #{bankCompany}
+        SELECT *
+        FROM user_cost_finansys
+        WHERE bank_name = #{bankName}
+          AND bank_card = #{bankCard}
+          AND bank_card_user = #{bankCardUser}
+          AND bank_company = #{bankCompany}
     </select>
 
     <select id="selectAll" resultType="com.blt.other.module.database.model.UserCostFinansysDomain">
-        SELECT
-        *
-        FROM
-        user_cost_finansys
-        ORDER BY
-        id DESC
+        SELECT *
+        FROM user_cost_finansys
+        ORDER BY id DESC
     </select>
 
     <select id="selectByBankInfo" resultType="com.blt.other.module.database.model.UserCostFinansysDomain">
-        SELECT
-        *
-        FROM
-        user_cost_finansys
-        WHERE
-        bank_name = #{bankName}
-        AND
-        bank_card = #{bankCard}
-        AND
-        bank_card_user = #{bankCardUser}
-        AND
-        bank_company = #{bankCompany}
+        SELECT *
+        FROM user_cost_finansys
+        WHERE bank_name = #{bankName}
+          AND bank_card = #{bankCard}
+          AND bank_card_user = #{bankCardUser}
+          AND bank_company = #{bankCompany}
     </select>
 
     <update id="updateBySyncId" parameterType="com.blt.other.module.database.model.CostDomain">
@@ -92,13 +69,9 @@
     </update>
 
     <select id="selectByUserid" resultType="com.blt.other.module.database.model.UserCostFinansysDomain">
-        SELECT
-        *
-        FROM
-        user_cost_finansys
-        WHERE
-        userid = #{userid}
-        ORDER BY
-        id DESC
+        SELECT *
+        FROM user_cost_finansys
+        WHERE userid = #{userid}
+        ORDER BY id DESC
     </select>
 </mapper>

bailuntec-cost-core/src/main/shell/deploy-miniapp-prod.sh

@@ -2,7 +2,7 @@
 cd /home/ubuntu/data/other/dc-cost-system/bailuntec-cost-core
 git pull
 # 拉取开发分支代码
-git checkout master
+git checkout cost-check-flow
 #打包
 mvn clean package -Dmaven.test.skip=true  -Dmaven.compile.fork=true
 # kill测试进程