联调接口

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ProjectCostBudgetStatsVO.java

@@ -37,4 +37,7 @@ public class ProjectCostBudgetStatsVO extends ProjectCostBudgetStats {
 
     @ApiModelProperty(value = "建设单位预算集合")
     private List<ProjectCostBudget> constructUnit;
+
+    @ApiModelProperty(value = "1显示提交审批，0不显示")
+    private String approveStatus;
 }

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

@@ -21,18 +21,31 @@
                (select dict_name  from c_dict_info WHERE code = 'contract_type' AND dict_value= cci.contract_type) as contractTypeValue
         from c_control_project_info cpi left join c_control_contract_info cci on cpi.id = cci.project_id
     </select>
+<!--    <select id="getReturnedByAnnualBudgetId" resultType="org.springblade.control.vo.AnnualBudgetIncomeVO">-->
+<!--        SELECT-->
+<!--                (select name from c_control_project_info WHERE id = abi.project_id ) as projectName,-->
+<!--                (select dict_name  from c_dict_info WHERE code = 'project_income_type' AND dict_value = abi.income_type) as incomeTypeValue,-->
+<!--                abi.project_type_value ,-->
+<!--               abi.contract_type_value,-->
+<!--               cri.practical_returned_time as returnTime,-->
+<!--               cri.practical_returned_money as returnMoney-->
+<!--        FROM c_annual_budget_income abi left join c_contract_returned_info cri on abi.project_id = cri.project_id-->
+<!--        WHERE cri.practical_returned_time is not null and cri.practical_returned_money is not NULL-->
+<!--          AND abi.annual_budget_id = #{id}-->
+<!--    </select>-->
+
     <select id="getReturnedByAnnualBudgetId" resultType="org.springblade.control.vo.AnnualBudgetIncomeVO">
-        SELECT
+        SELECT  abi.predict_contract_money,
                 (select name from c_control_project_info WHERE id = abi.project_id ) as projectName,
                 (select dict_name  from c_dict_info WHERE code = 'project_income_type' AND dict_value = abi.income_type) as incomeTypeValue,
                 abi.project_type_value ,
-               abi.contract_type_value,
-               cri.practical_returned_time as returnTime,
-               cri.practical_returned_money as returnMoney
-        FROM c_annual_budget_income abi left join c_contract_returned_info cri on abi.project_id = cri.project_id
-        WHERE cri.practical_returned_time is not null and cri.practical_returned_money is not NULL
-          AND abi.annual_budget_id = #{id}
+                abi.contract_type_value,
+                abi.predict_sign_date as returnTime,
+                abi.predict_annual_returned as returnMoney
+        FROM c_annual_budget_income abi
+        WHERE abi.annual_budget_id = #{id}
     </select>
+
     <select id="getDisburseByAnnualBudgetId" resultType="org.springblade.control.vo.AnnualBudgetDisburseVO">
         select abd.*,
                (select dict_name  from c_dict_info WHERE `type` = 1 AND dict_value = abd.budget_subject AND parent_id = 0) as budgetSubjectValue,

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

@@ -26,6 +26,7 @@
                     and (pcb.plan_start_time BETWEEN dmp.plan_start_date AND dmp.plan_end_date
                     or pcb.plan_end_time BETWEEN dmp.plan_start_date AND dmp.plan_end_date)) as 'beginPlanTotal'
         FROM c_department_month_plan dmp
+        order by dmp.plan_start_date desc
     </select>
     <select id="getDepartmentUserDict" resultType="org.springblade.core.secure.BladeUser">
 

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

@@ -14,7 +14,9 @@
     </select>
 
     <select id="page" resultType="org.springblade.control.vo.ProjectCostBudgetStatsVO">
-        SELECT cbs.*,cpi.name as projectName,CASE cbs.status WHEN '0' THEN '未上报' WHEN '1' THEN '已上报' WHEN '2' THEN '已审批' ELSE '已驳回' END as statusValue
+        SELECT cbs.*,cpi.name as projectName,
+--                CASE cbs.status WHEN '0' THEN '未上报' WHEN '1' THEN '已上报' WHEN '2' THEN '已审批' ELSE '已驳回' END as statusValue
+        IF ((select COUNT(1)  from c_project_cost_budget pcb WHERE pcb.project_id = cbs.project_id and pcb.approve = 0)=0,0,1) as 'approveStatus'
         from c_project_cost_budget_stats cbs left join bladex.c_control_project_info cpi on cbs.project_id = cpi.id
         where cbs.is_deleted = 0
         <if test="queryValue != null and queryValue != ''">

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

@@ -23,7 +23,7 @@
             and pi.implement_principal = #{dto.implementPrincipal}
         </if>
         <if test="dto.queryDate != null and dto.queryDate != ''">
-            and #{dto.queryDate} BETWEEN pi.start_time AND pi.end_time
+            and #{dto.queryDate} between DATE_FORMAT(pi.start_time ,'%Y-%m') and DATE_FORMAT(pi.end_time ,'%Y-%m')
         </if>
         <if test="dto.queryValue != null and dto.queryValue != ''">
             and pi.name like concat('%', #{dto.queryValue}, '%')

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

@@ -22,6 +22,8 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Query;
 import org.springblade.system.entity.DictBiz;
 import org.springframework.beans.BeanUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,6 +41,8 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
 
     private final IContractReturnedInfoService returnedInfoService;
 
+    private final JdbcTemplate jdbcTemplate;
+
     /**
      * 添加合同信息
      */
@@ -48,6 +52,9 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
         Long id = SnowFlakeUtil.getId();
         dto.setId(id);
         BeanUtils.copyProperties(dto,contractInfo);
+        if (dto.getStartTime() != null && dto.getEndTime() != null){
+            jdbcTemplate.execute("update c_control_project_info set start_time = '"+dto.getStartTime() + "', end_time = '"+ dto.getEndTime() +"' where id = "+ dto.getProjectId());
+        }
         baseMapper.insert(contractInfo);
         returnedInfoService.saveOrUpdateBatchReturned(dto);
 
@@ -94,6 +101,9 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
     public void updateContractInfo(ControlContractInfoDTO dto) {
         ControlContractInfo contractInfo = new ControlContractInfo();
         BeanUtils.copyProperties(dto,contractInfo);
+        if (dto.getStartTime() != null && dto.getEndTime() != null){
+            jdbcTemplate.execute("update c_control_project_info set start_time = '"+dto.getStartTime() + "', end_time = '"+ dto.getEndTime() +"' where id = "+ dto.getProjectId());
+        }
         this.updateById(contractInfo);
         returnedInfoService.saveOrUpdateBatchReturned(dto);
     }

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

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