政策添加申请时间

src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.excel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierContacts;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
@@ -75,6 +76,7 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService {
         //暂未定义时间区间
         List<TbsActivity> activityList = activityMapper.selectList(actLqw);
         List<DataCheckApplyDetailItem> detailItemList = new ArrayList<>();
+        if(CollectionUtil.isNotEmpty(activityList)){
             for (TbsActivity activity : activityList) {
                 TbsCostApply costApply = costApplyMapper.selectById(activity.getCostApplyId());
                 DataCheckApplyDetailItem detailItem = new DataCheckApplyDetailItem();
@@ -146,6 +148,21 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService {
                 }
                 detailItemList.add(detailItem);
             }
+        }else {
+            DataCheckApplyDetailItem detailItem = new DataCheckApplyDetailItem();
+            detailItem.setActivityCode("");
+            detailItem.setActivityDate("");
+            detailItem.setActivityTheme("");
+            detailItem.setCostApplyAmt(BigDecimal.ZERO);
+            detailItem.setCheckedAmt(BigDecimal.ZERO);
+            detailItem.setCheckingAmt(BigDecimal.ZERO);
+            detailItem.setNotCheckAmt(BigDecimal.ZERO);
+            detailItem.setDontCheckAmt(BigDecimal.ZERO);
+            detailItem.setPayAmt(BigDecimal.ZERO);
+            detailItem.setUnPayAmt(BigDecimal.ZERO);
+            detailItem.setNotPayAmt(BigDecimal.ZERO);
+            detailItemList.add(detailItem);
+        }
         detailInfo.setDetailList(detailItemList);
         return detailInfo;
     }
@@ -170,6 +187,9 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService {
 
         //申请总金额
         BigDecimal totalAmount = activityMapper.sumSupplierActivityCost(supplierId);
+        if(totalAmount==null){
+            totalAmount = BigDecimal.ZERO;
+        }
         mainInfo.setCostApplyAmt(totalAmount);
         if(totalAmount.compareTo(BigDecimal.ZERO)==0){
             mainInfo.setCostApplyAmt(totalAmount);

src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
 public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemBudget> {
 
     /**
-     * 统计费用申请时，已占用的预算金额
+     * 统计费用申请占用的预算金额
      * @param scheduleItemBudgetId 预算考核期id
      * @param applyId 费用申请id(防止驳回后提交重复扣除)
      * @return
@@ -28,7 +28,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
     BigDecimal totalApplyAmount(@Param("scheduleItemBudgetId") Long scheduleItemBudgetId,@Param("applyId") Long applyId);
 
     /**
-     * 统计政策申请时，已占用的预算金额
+     * 统计政策申请已占用的预算金额
      * @param scheduleItemBudgetId
      * @param policyId
      * @return
@@ -77,11 +77,11 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
     @Select("SELECT  sum( amount )  FROM  `tbs_budget_log` " +
             " LEFT JOIN   `tzc_policy` " +
             "   ON `tbs_budget_log`.policy_id = tzc_policy.id " +
-            "   AND `tbs_budget_log`.rollback_flag = '0' " +
+            //"   AND `tbs_budget_log`.rollback_flag = '0' " +
             "WHERE   `tbs_budget_log`.budget_id = #{budgetId} " +
             " AND  `tbs_budget_log`.schedule_item_id = #{scheduleItemId} " +
             " AND `tzc_policy`.id != #{policyId}  " +
-            " AND `tzc_policy`.policy_status in (1,2,4) ")
+            " AND `opt_type` in (11,12,13,14,15) ")
     BigDecimal totalCostAmountByPolicyId(@Param("budgetId") Long budgetId,
                                         @Param("scheduleItemId") Long scheduleItemId,
                                         @Param("policyId") Long policyId);

src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java

@@ -96,6 +96,11 @@ public class TzcPolicy implements Serializable {
 
     private String syFlowId;
 
+    /** 提交时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime submitTime;
+
     /** 备注 */
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -190,6 +190,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
         updPolicy.setId(policyId);
         updPolicy.setSyFlowId(flowId);
         updPolicy.setSyFormId(formId);
+        updPolicy.setSubmitTime(LocalDateTime.now());
         updPolicy.setPolicyStatus(TzcPolicyStatus.Status_1_Checking);
         tzcPolicyService.updateById(updPolicy);
         tzcPolicy = tzcPolicyService.getById(policyId);
@@ -211,9 +212,8 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
         //保存预算使用日志
         List<TbsBudgetLog> budgetLogList = saveBudgetLog(result, sysUser, tzcPolicy, result.getPolicyBudgetMatchList(),result.getPolicyItemList());
         if(tzcPolicy.getPolicyStatus().equals(TzcPolicyStatus.Status_0_UnCommit)){
-            if(CollectionUtil.isNotEmpty(budgetLogList)){
+            //todo 待测试，没能触发到
             budgetLogService.saveBatch(budgetLogList);
-            }
         }else {
             //排除历史记录
             LambdaQueryWrapper<TbsBudgetLog> logLqw = new LambdaQueryWrapper<>();
@@ -608,7 +608,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
                     lastAmount = BigDecimal.ZERO;
                 }
                 //判断是否够用
-                if(budgetAmount.subtract(lastAmount).subtract(totalUsed).compareTo(goodsAmount)>0){
+                if(budgetAmount.subtract(lastAmount).subtract(totalUsed).compareTo(goodsAmount)>=0){
                     budgetItemCostResult.setBudgetId(itemBudget.getBudgetId());
                     budgetItemCostResult.setScheduleId(itemBudget.getScheduleId());
                     budgetItemCostResult.setScheduleItemId(itemBudget.getScheduleItemId());

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyOperationServiceImpl.java

@@ -9,6 +9,7 @@ import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
 import com.qs.serve.modules.tbs.entity.TbsBudgetLog;
+import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
 import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo;
 import com.qs.serve.modules.tbs.service.TbsBudgetLogService;
@@ -44,6 +45,15 @@ public class TzcPolicyOperationServiceImpl implements SeeYonOperationService {
         return affairCommit.getPolicyId()+"";
     }
 
+    @Override
+    public boolean checkSyFormIdIsNotNull(String targetId) {
+        TzcPolicy policy = tzcPolicyService.getById(targetId);
+        if(policy!=null&&policy.getSyFormId()!=null){
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public String getSyFormIdByTargetInfo(TbsAffairCommitBo affairCommit) {
         TzcPolicy tzcPolicy = tzcPolicyService.getById(affairCommit.getPolicyId());