Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java

@@ -44,6 +44,17 @@ public class DateCheckApplyController {
     @SysLog(module = SystemModule.Verification, title = "客户汇总账单", biz = BizType.EXPORT)
     public R<DataCheckApplyMainInfo> getSummary(DataSupplierSo param){
         param.setEndDate(LocalDate.now());
+        if(param.getSaFlag().equals(0)){
+            SysConfig config = configService.getByKey(SysConfigKey.DateCheckApplyExcelYear);
+            if(config==null){
+                Assert.throwEx("没有设置全局变量【导出明细时间段】");
+            }
+            String year = config.getConfigValue();
+            Integer yearNum = Integer.parseInt(year)-1;
+
+            LocalDate startDate = LocalDate.of(LocalDate.now().getYear()-yearNum,1,1);
+            param.setStartDate(startDate);
+        }
         DataCheckApplyMainInfo info = dateCheckApplyService.getDataCheckApplyMainInfo(param);
         return R.ok(info);
     }

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

@@ -88,20 +88,6 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService {
             List<DataCheckApplyDetailItem> dataCheckApplyDetailItems = tbsCostApplySumAmountMapper.selectDataCheckApplyDetailItem(null,costApplyList.stream().map(a->a.getId()).collect(Collectors.toList()));
 
             detailItemList.addAll(dataCheckApplyDetailItems);
-        }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);
@@ -115,16 +101,33 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService {
         LambdaQueryWrapper<BmsSupplierContacts> conLqw = new LambdaQueryWrapper<>();
         conLqw.eq(BmsSupplierContacts::getSupplierId,supplierId);
         BmsSupplierContacts contacts = supplierContactsService.getOne(conLqw,false);
-        DataCheckApplyMainInfo mainInfo = tbsCostApplySumAmountMapper.selectDataCheckApplyMainInfo(param.getSupplierId());
+
+        LambdaQueryWrapper<TbsCostApply> costApplyLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        costApplyLambdaQueryWrapper.eq(TbsCostApply::getSupplierId,supplierId);
+        if(param.getStartDate()!=null){
+            costApplyLambdaQueryWrapper.ge(TbsCostApply::getSubmitTime,param.getStartDate());
+        }
+        costApplyLambdaQueryWrapper.le(TbsCostApply::getSubmitTime,param.getEndDate().atTime(23,59,59));
+        costApplyLambdaQueryWrapper.in(TbsCostApply::getChargeState,TbsCostApplyState.getPassCode());
+        List<TbsCostApply> costApplyList = costApplyMapper.selectList(costApplyLambdaQueryWrapper);
+
+        DataCheckApplyMainInfo mainInfo;
+        if(CollectionUtil.isNotEmpty(costApplyList)) {
+            mainInfo = tbsCostApplySumAmountMapper.selectDataCheckApplyMainInfo(param.getSupplierId(), costApplyList.stream().map(a -> a.getId()).collect(Collectors.toList()));
+        }else{
+            mainInfo = new DataCheckApplyMainInfo();
+        }
+
         mainInfo.setCusName(supplier.getName());
         mainInfo.setCusAddress(supplier.getAddress());
         mainInfo.setCusCode(supplier.getCode());
-        if(contacts!=null){
+        if (contacts != null) {
             mainInfo.setContactUser(contacts.getContactsName());
             mainInfo.setContactMobile(contacts.getContactsNumber());
         }
-//        mainInfo.setStartDate(param.getStartDate());
+        mainInfo.setStartDate(param.getStartDate());
         mainInfo.setEndDate(param.getEndDate());
+        return mainInfo;
 
 //        LambdaQueryWrapper<TbsCostApply> costApplyLambdaQueryWrapper = new LambdaQueryWrapper<>();
 //        costApplyLambdaQueryWrapper.eq(TbsCostApply::getSupplierId,supplierId);
@@ -235,6 +238,6 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService {
 //            }
 //
 //        }
-        return mainInfo;
+//        return mainInfo;
     }
 }

src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java

@@ -3,18 +3,18 @@ package com.qs.serve.modules.pay.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.consts.SysConfigKey;
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.so.BmsSupplierSo;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
+import com.qs.serve.modules.excel.common.DataSupplierSo;
 import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo;
+import com.qs.serve.modules.excel.service.DateCheckApplyService;
 import com.qs.serve.modules.his.service.HisUserSupplierService;
 import com.qs.serve.modules.pay.common.PaymentType;
 import com.qs.serve.modules.pay.entity.PayPaymentItem;
@@ -24,6 +24,8 @@ import com.qs.serve.modules.pay.entity.dto.PaySupplierAmountDto;
 import com.qs.serve.modules.pay.entity.vo.PaySupplierVo;
 import com.qs.serve.modules.pay.mapper.PaySupplierMapper;
 import com.qs.serve.modules.pay.service.PayPaymentItemService;
+import com.qs.serve.modules.sys.entity.SysConfig;
+import com.qs.serve.modules.sys.service.SysConfigService;
 import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.tbs.mapper.TbsCostApplySumAmountMapper;
 import lombok.AllArgsConstructor;
@@ -39,6 +41,7 @@ import com.qs.serve.modules.pay.service.PayPaymentService;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -58,7 +61,8 @@ public class PayPaymentController {
     private PayPaymentItemService paymentItemService;
     private BmsSupplierService bmsSupplierService;
     private PaySupplierMapper paySupplierMapper;
-    private TbsCostApplySumAmountMapper tbsCostApplySumAmountMapper;
+    private DateCheckApplyService dateCheckApplyService;
+    private SysConfigService configService;
 
     /**
      * 客户费用列表
@@ -71,17 +75,35 @@ public class PayPaymentController {
         PageUtil.startPage();
         List<BmsSupplier> list = bmsSupplierService.list(lqw);
         if(CollectionUtil.isNotEmpty(list)){
-            List<PaySupplierVo> supplierVoList = getPaySupplierVos(paramSo, list);
+            List<PaySupplierVo> supplierVoList = getPaySupplierVos(paramSo, list,true);
             return R.byPageHelperList(list,supplierVoList);
         }
         return R.byEmptyList();
     }
 
     @NotNull
-    public List<PaySupplierVo> getPaySupplierVos(BmsSupplierSo paramSo, List<BmsSupplier> list) {
+    public List<PaySupplierVo> getPaySupplierVos(BmsSupplierSo paramSo, List<BmsSupplier> list, Boolean isAll) {
         List<PaySupplierVo> supplierVoList = new ArrayList<>();
+        DataSupplierSo so = new DataSupplierSo();
+        if(!isAll){
+            SysConfig config = configService.getByKey(SysConfigKey.DateCheckApplyExcelYear);
+            if(config==null){
+                Assert.throwEx("没有设置全局变量【导出明细时间段】");
+            }
+            String year = config.getConfigValue();
+            Integer yearNum = Integer.parseInt(year)-1;
+
+            LocalDate startDate = LocalDate.of(LocalDate.now().getYear()-yearNum,1,1);
+            if(paramSo.getQueryStartTime()==null || startDate.isAfter(paramSo.getQueryStartTime().toLocalDate())){
+                so.setStartDate(startDate);
+            }
+        }else {
+            so.setStartDate(paramSo.getQueryStartTime()==null?null:paramSo.getQueryStartTime().toLocalDate());
+        }
+        so.setEndDate(paramSo.getQueryEndTime()==null?LocalDate.now():paramSo.getQueryEndTime().toLocalDate());
         list.forEach(supplier->{
-            DataCheckApplyMainInfo mainInfo = tbsCostApplySumAmountMapper.selectDataCheckApplyMainInfo(supplier.getId());
+            so.setSupplierId(supplier.getId());
+            DataCheckApplyMainInfo mainInfo = dateCheckApplyService.getDataCheckApplyMainInfo(so);
             PaySupplierVo supplierVo = new PaySupplierVo();
             supplierVo.setSupplierId(Long.parseLong(supplier.getId()));
             supplierVo.setSupplierCode(supplier.getCode());

src/main/java/com/qs/serve/modules/pay/controller/my/PayPaymentMyController.java

@@ -2,14 +2,12 @@ package com.qs.serve.modules.pay.controller.my;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.consts.SysConfigKey;
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.so.BmsSupplierSo;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
@@ -27,6 +25,7 @@ import com.qs.serve.modules.pay.entity.vo.PaySupplierVo;
 import com.qs.serve.modules.pay.mapper.PaySupplierMapper;
 import com.qs.serve.modules.pay.service.PayPaymentItemService;
 import com.qs.serve.modules.pay.service.PayPaymentService;
+import com.qs.serve.modules.sys.entity.SysConfig;
 import com.qs.serve.modules.sys.service.SysPostUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -36,6 +35,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -67,7 +67,7 @@ public class PayPaymentMyController {
         BmsSupplier param = CopierUtil.copy(paramSo,new BmsSupplier());
         PageVo<BmsSupplier> pageVo = hisUserSupplierService.selectPageSupplier(param);
         if(CollectionUtil.isNotEmpty(pageVo.getList())){
-            List<PaySupplierVo> supplierVoList = payPaymentController.getPaySupplierVos(paramSo, pageVo.getList());
+            List<PaySupplierVo> supplierVoList = payPaymentController.getPaySupplierVos(paramSo, pageVo.getList(),false);
             return R.ok(PageVo.initNewList(pageVo,supplierVoList));
         }
         return R.byEmptyList();
@@ -85,7 +85,7 @@ public class PayPaymentMyController {
         param.setSelectUserIdsFlag(true);
         PageVo<BmsSupplier> pageVo = hisUserSupplierService.selectPageSupplier(param);
         if(CollectionUtil.isNotEmpty(pageVo.getList())){
-            List<PaySupplierVo> supplierVoList = payPaymentController.getPaySupplierVos(paramSo, pageVo.getList());
+            List<PaySupplierVo> supplierVoList = payPaymentController.getPaySupplierVos(paramSo, pageVo.getList(),false);
             return R.ok(PageVo.initNewList(pageVo,supplierVoList));
         }
         return R.byEmptyList();
@@ -104,7 +104,7 @@ public class PayPaymentMyController {
         param.setSelectUserIdsFlag(true);
         PageVo<BmsSupplier> pageVo = hisUserSupplierService.selectPageSupplier(param);
         if(CollectionUtil.isNotEmpty(pageVo.getList())){
-            List<PaySupplierVo> supplierVoList = payPaymentController.getPaySupplierVos(paramSo, pageVo.getList());
+            List<PaySupplierVo> supplierVoList = payPaymentController.getPaySupplierVos(paramSo, pageVo.getList(),false);
             return R.ok(PageVo.initNewList(pageVo,supplierVoList));
         }
         return R.byEmptyList();

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -312,7 +312,7 @@ public class SysUserController {
             param.setSyUserId("");
         }
         if(param.getSyAccount()==null){
-            param.setSyAccount("");
+            param.setSyAccount(userBo.getCode());
         }
         param.setId("SU"+IdUtil.getSnowFlakeId());
         boolean result = sysUserService.save(param);
@@ -337,12 +337,12 @@ public class SysUserController {
         if(param.getLoginEnable()!=null){
             param.setServingState(param.getLoginEnable()==1?1:0);
         }
-        if(param.getSyUserId()==null){
+//        if(param.getSyUserId()==null){
-            param.setSyUserId("");
+            param.setSyUserId(null);
-        }
+//        }
-        if(param.getSyAccount()==null){
+//        if(param.getSyAccount()==null){
-            param.setSyAccount("");
+            param.setSyAccount(null);
-        }
+//        }
         param.setSuperFlag(null);
         param.setPassword(null);
         param.setUpdateTime(LocalDateTime.now());

src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java

@@ -117,7 +117,10 @@ public class TbsBudgetController {
     @PreAuthorize("hasRole('tbs:budget:query')")
     public R<TbsBudgetVo> getById(@PathVariable("id") String id){
         TbsBudget budget = tbsBudgetService.getById(id);
-        return R.ok(tbsBudgetService.toVoEntity(budget));
+        TbsBudgetVo vo = tbsBudgetService.toVoEntity(budget);
+//        TbsBudgetVo vo2 = tbsBudgetService.getEntityForExcel(budget);
+//        vo.setScheduleItemBudgets(vo2.getScheduleItemBudgets());
+        return R.ok(vo);
     }
 
     /**

src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetLogController.java

@@ -5,10 +5,13 @@ import com.qs.serve.common.model.annotation.SysLog;
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
+import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper;
+import com.qs.serve.modules.tbs.service.TbsScheduleItemBudgetService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.annotations.Param;
@@ -20,6 +23,7 @@ import com.qs.serve.modules.tbs.service.TbsBudgetLogService;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 预算 预算日志
@@ -34,6 +38,8 @@ public class TbsBudgetLogController {
 
     private TbsBudgetLogService tbsBudgetLogService;
     private TbsBudgetLogMapper tbsBudgetLogMapper;
+    private TbsScheduleItemBudgetService tbsScheduleItemBudgetService;
+    private TbsBudgetLogService budgetLogService;
 
     /**
      * 翻页
@@ -56,9 +62,36 @@ public class TbsBudgetLogController {
      * @return
      */
     @GetMapping("/getItemAmount")
-    public R<?> getAmount(Long budgetId,Long itemId){
+    public R<TbsScheduleItemBudget> getAmount(Long budgetId,Long itemId){
-        BigDecimal amount = tbsBudgetLogMapper.countBudgetItemAmount(budgetId,itemId);
+        LambdaQueryWrapper<TbsScheduleItemBudget> lqw = new LambdaQueryWrapper<>();
-        return R.ok(amount);
+        lqw.eq(TbsScheduleItemBudget::getBudgetId,budgetId);
+        lqw.eq(TbsScheduleItemBudget::getScheduleItemId,itemId);
+        List<TbsScheduleItemBudget> tbsScheduleItemBudgetList = tbsScheduleItemBudgetService.list(lqw);
+
+        Optional<TbsScheduleItemBudget> optional =  tbsScheduleItemBudgetList.stream().findFirst();
+        if(optional.isPresent()){
+            TbsScheduleItemBudget a = optional.get();
+            LambdaQueryWrapper<TbsBudgetLog> lqwLog = new LambdaQueryWrapper<>();
+            lqwLog.eq(TbsBudgetLog::getScheduleItemBudgetId,a.getId());
+            lqwLog.eq(TbsBudgetLog::getBudgetId,budgetId);
+            List<TbsBudgetLog> tbsBudgetLogList = budgetLogService.list(lqwLog);
+//            a.setBudgetLogList(tbsBudgetLogList);
+
+            BigDecimal finalBudgetAmount = tbsBudgetLogList.stream().filter(b-> BudgetLogOptFlag.getFinalBudgetOptFlag().contains(b.getOptType())).map(TbsBudgetLog::getAmount)
+                    .reduce(BigDecimal.ZERO,BigDecimal::add);
+
+            BigDecimal usedBudgetAmount = tbsBudgetLogList.stream().filter(b->!BudgetLogOptFlag.getFinalBudgetOptFlag().contains(b.getOptType())).map(TbsBudgetLog::getAmount)
+                    .reduce(BigDecimal.ZERO,BigDecimal::add);
+
+            BigDecimal unUsedBudgetAmount = tbsBudgetLogList.stream().map(TbsBudgetLog::getAmount)
+                    .reduce(BigDecimal.ZERO,BigDecimal::add);
+
+            a.setFinalBudgetAmount(finalBudgetAmount);
+            a.setUnUsedBudgetAmount(unUsedBudgetAmount);
+            a.setUsedBudgetAmount(usedBudgetAmount);
+            return R.ok(a);
+        }
+        return R.ok();
     }
 
     /**

src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java

@@ -88,7 +88,9 @@ public class TbsCostApplyVo implements Serializable {
     /**
      * 0=>未逾期、1=>已逾期、2=>即将逾期
      */
-    Integer overdueState;
+    private Integer overdueState;
+
+    private String templateTitle;
 
 }
 

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

@@ -22,6 +22,7 @@ public interface TbsCostApplySumAmountMapper {
     List<DataCheckApplyDetailItem> selectDataCheckApplyDetailItem(@Param("supplierId")String supplierId,
                                                                   @Param("costApplyIds")List<Long> costApplyIds);
 
-    DataCheckApplyMainInfo selectDataCheckApplyMainInfo(@Param("supplierId")String supplierId);
+    DataCheckApplyMainInfo selectDataCheckApplyMainInfo(@Param("supplierId")String supplierId,
+                                                        @Param("costApplyIds")List<Long> costApplyIds);
 }
 

src/main/resources/mapper/tbs/TbsCostApplyMapper.xml

@@ -58,7 +58,8 @@
         tbs_cost_apply.`create_by`,
         tbs_cost_apply.`update_by`,
         tbs_cost_apply.`del_flag`,
-        tbs_cost_apply.`template_id`   </sql>
+        tbs_cost_apply.`template_id`,
+        tbs_cost_apply.`template_title` </sql>
 
 
 
@@ -151,6 +152,7 @@
         <if test="query.createBy != null and query.createBy != ''"> and `tbs_cost_apply`.`create_by` = #{query.createBy}</if>
         <if test="query.updateBy != null and query.updateBy != ''"> and `tbs_cost_apply`.`update_by` = #{query.updateBy}</if>
         <if test="query.delFlag != null and query.delFlag != ''"> and `tbs_cost_apply`.`del_flag` = #{query.delFlag}</if>
+        <if test="query.templateTitle != null and query.templateTitle != ''"> and `tbs_cost_apply`.`template_title` like concat('%', #{query.templateTitle},'%')</if>
     </sql>
 </mapper>
 

src/main/resources/mapper/tbs/TbsCostApplySumAmountMapper.xml

@@ -151,7 +151,13 @@
         c.del_flag = 0
         AND c.charge_state IN (2, 3)
         <if test="supplierId !=null">
-            AND c.supplier_id = #{supplierId};
+            AND c.supplier_id = #{supplierId}
+        </if>
+        <if test="costApplyIds !=null and costApplyIds.size > 0">
+            and c.id in
+            <foreach collection="costApplyIds" item ="selectId" index="i" open="(" close=")" separator=",">
+                #{selectId}
+            </foreach>
         </if>
     </select>
 </mapper>