微调

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

@@ -334,9 +334,9 @@ public class SysUserController {
     public R<?> updateById(@RequestBody SysUserBo userBo){
         SysUser param = CopierUtil.copy(userBo,new SysUser());
         param.setCode(null);
-        if(param.getLoginEnable()!=null){
-            param.setServingState(param.getLoginEnable()==1?1:0);
-        }
+//        if(param.getLoginEnable()!=null){
+//            param.setServingState(param.getLoginEnable()==1?1:0);
+//        }
 //        if(param.getSyUserId()==null){
             param.setSyUserId(null);
 //        }

src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetLogWithAmount.java

@@ -0,0 +1,18 @@
+package com.qs.serve.modules.tbs.entity.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author YenHex
+ * @since 2023/6/29
+ */
+@Data
+public class TbsBudgetLogWithAmount {
+
+    Long id;
+
+    BigDecimal amt;
+
+}

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

@@ -3,6 +3,7 @@ package com.qs.serve.modules.tbs.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogPreAmount;
+import com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogWithAmount;
 import com.qs.serve.modules.tbs.entity.dto.TbsScheduleItemBudgetAmount;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -144,5 +145,8 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
 
     Long findUnMatchScheduleItemBySourceBudgetIdAndTargetBudgetId(@Param("sourceId")Long sourceId, @Param("targetId")Long targetId);
 
+
+    List<TbsBudgetLogWithAmount> getAllByScheduleItemIdList(@Param("selectIds") List<Long> ids);
+
 }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogWithAmount;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -11,6 +12,7 @@ import com.qs.serve.modules.tbs.mapper.TbsScheduleItemBudgetMapper;
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 预算考核期项 服务实现类
@@ -28,7 +30,19 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl<TbsScheduleIte
         lqw.le(TbsScheduleItemBudget::getStartDate,startDate);
         lqw.ge(TbsScheduleItemBudget::getEndDate,endDate);
         lqw.last("order by timediff(start_date,end_date) desc,end_date asc");
-        return this.list(lqw);
+        //初始化金额
+        List<TbsScheduleItemBudget> scheduleItemBudgetList = this.list(lqw);
+        List<Long> ids = scheduleItemBudgetList.stream().map(TbsScheduleItemBudget::getId).collect(Collectors.toList());
+        List<TbsBudgetLogWithAmount> amountList = this.baseMapper.getAllByScheduleItemIdList(ids);
+        for (TbsScheduleItemBudget itemBudget : scheduleItemBudgetList) {
+            for (TbsBudgetLogWithAmount withAmount : amountList) {
+                if(itemBudget.getId().equals(withAmount.getId())){
+                    itemBudget.setBudgetAmount(withAmount.getAmt());
+                    break;
+                }
+            }
+        }
+        return scheduleItemBudgetList;
     }
 
     @Override

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

@@ -143,5 +143,20 @@
         on `source`.start_date >= target.start_date and source.end_date <= target.end_date
         where target.id is null
     </select>
+
+    <select id="getAllByScheduleItemIdList"
+            resultType="com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogWithAmount">
+        select
+               schedule_item_budget_id as id,
+               sum(amount) as amt
+        from tbs_budget_log
+        where
+          opt_type in (0,2,3)
+        AND schedule_item_budget_id in
+        <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
+            #{selectId}
+        </foreach>
+        group by schedule_item_budget_id
+    </select>
 </mapper>