Merge remote-tracking branch 'origin/master' into master

blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectCostBudgetController.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.control.dto.ControlProjectInfoDTO;
 import org.springblade.control.dto.ProjectCostBudgetDTO;
+import org.springblade.control.entity.DictInfo;
 import org.springblade.control.entity.ProjectCostBudget;
 import org.springblade.control.service.IProjectCostBudgetService;
 import org.springblade.control.vo.*;
@@ -168,5 +169,24 @@ public class ProjectCostBudgetController {
         return R.data(budgetService.planFinishedRatio(deptId,userId,start,end));
     }
 
+    /**
+     * 查询预览-费用分类列表
+     */
+    @GetMapping("/getCostType")
+    @ApiOperationSupport(order = 12)
+    @ApiOperation(value = "查询预览-费用分类列表")
+    public R<List<DictInfo>> getCostType(){
+        return R.data(budgetService.getCostType());
+    }
+
+    /**
+     * 查询预览-单位列表
+     */
+    @GetMapping("/getUnitType")
+    @ApiOperationSupport(order = 13)
+    @ApiOperation(value = "查询预览-单位列表")
+    public R<List<DictInfo>> getUnitType(){
+        return R.data(budgetService.getUnitType());
+    }
 
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ContractInfoMapper.xml

@@ -24,6 +24,9 @@
         (IFNULL(( select sum(cri.should_returned_money) from c_contract_returned_info cri where cri.should_returned_time < NOW()  and cri.contract_id = ci.id and cri.is_deleted=0), 0) -
         IFNULL(( select sum(cri.practical_returned_money) from c_contract_returned_info cri where cri.contract_id = ci.id and cri.is_deleted=0), 0)) as unreturnedMoney
         from c_control_contract_info ci where ci.is_deleted = 0
+        <if test="dto.queryValue != null and dto.queryValue != ''">
+            and ci.name like concat('%', #{dto.queryValue}, '%')
+        </if>
     </select>
     <select id="getNoConnectionProject2" resultType="org.springblade.control.entity.ControlProjectInfo">
         select pi.id,pi.name from c_control_project_info pi WHERE pi.is_deleted = 0

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectCostBudgetMapper.java

@@ -75,4 +75,8 @@ public interface ProjectCostBudgetMapper extends BaseMapper<ProjectCostBudget> {
     List<User> getAllEmployees(@Param("tenantId") String tenantId,@Param("deptId") Long deptId,@Param("userId") Long userId);
 
     List<ProjectCostBudget> getPlanByDeptOrUserOrTime2(@Param("ids") Set<Long> ids, @Param("start") LocalDate start,@Param("end") LocalDate end);
+
+    List<DictInfo> getCostType();
+
+    List<DictInfo> getUnitType();
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectCostBudgetMapper.xml

@@ -240,6 +240,12 @@
             #{id}
         </foreach>
     </select>
+    <select id="getCostType" resultType="org.springblade.control.entity.DictInfo">
+        select * from c_dict_info WHERE code = 'cost_type' order by sort
+    </select>
+    <select id="getUnitType" resultType="org.springblade.control.entity.DictInfo">
+        select * from c_dict_info WHERE code = 'unit_type' order by sort
+    </select>
 
 
 </mapper>

blade-service/blade-control/src/main/java/org/springblade/control/service/IProjectCostBudgetService.java

@@ -71,4 +71,8 @@ public interface IProjectCostBudgetService extends BaseService<ProjectCostBudget
     List<ProjectCostBudget> getPlanPracticalCostByMonth(String date);
 
     PlanFinishedRatioVO planFinishedRatio(Long deptId, Long userId, String start, String end);
+
+    List<DictInfo> getCostType();
+
+    List<DictInfo> getUnitType();
 }

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectCostBudgetServiceImpl.java

@@ -702,6 +702,32 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
         return null;
     }
 
+    /**
+     * 查询预览-费用分类列表
+     */
+    @Override
+    public List<DictInfo> getCostType() {
+        List<DictInfo> costType = baseMapper.getCostType();
+        DictInfo dictInfo = new DictInfo();
+        dictInfo.setDictName("所有");
+        dictInfo.setDictValue(-1);
+        costType.add(dictInfo);
+        return costType;
+    }
+
+    /**
+     * 查询预览-单位列表
+     */
+    @Override
+    public List<DictInfo> getUnitType() {
+        List<DictInfo> unitType = baseMapper.getUnitType();
+        DictInfo dictInfo = new DictInfo();
+        dictInfo.setDictName("所有");
+        dictInfo.setDictValue(-1);
+        unitType.add(dictInfo);
+        return unitType;
+    }
+
     /**
      * 统计一行的几个总金额
      */

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectCostBudgetStatsServiceImpl.java

@@ -117,6 +117,12 @@ public class ProjectCostBudgetStatsServiceImpl extends BaseServiceImpl<ProjectCo
         ProjectCostBudgetStatsVO vo = new ProjectCostBudgetStatsVO();
         ControlProjectInfo projectInfo = projectInfoService.getById(costBudget.getProjectId());
         vo.setProjectName(projectInfo.getName());
+        if (costBudget.getCostType() != null && costBudget.getCostType() == -1){
+            costBudget.setCostType(null);
+        }
+        if (costBudget.getUnitType() != null && costBudget.getUnitType() == -1){
+            costBudget.setUnitType(null);
+        }
         List<ProjectCostBudgetVO> list = budgetService.budgetList(costBudget);
         BigDecimal bigDecimal = new BigDecimal("0");
         for (ProjectCostBudgetVO l : list) {

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectInfoServiceImpl.java

@@ -108,7 +108,7 @@ public class ProjectInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, C
             throw new ServiceException("项目存在合同，不能删除");
         }
         List<ProjectCostBudget> list = budgetService.list(new LambdaQueryWrapper<ProjectCostBudget>().eq(ProjectCostBudget::getProjectId, id));
-        if (list != null || list.size() > 0){
+        if (list != null && list.size() > 0){
             throw new ServiceException("项目已经做了预算，不能删除");
         }
         baseMapper.deleteById(id);