bonus
/
yn_digital_gadgets_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

联调问题

This commit is contained in:
马三炮 2025-12-24 17:31:34 +08:00
parent 3a723d1b28
commit e6c4128270
7 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-business/src/main/java/com/bonus/digital/controller/MonthlyPlanController.java
View File

@ -120,7 +120,9 @@ public class MonthlyPlanController extends BaseController {
@PostMapping("/export")
public void export(HttpServletResponse response, MonthlyPlanVo monthlyPlanVo) throws IOException {
List<ExportMonthPlanPersonVo> list = monthlyPlanService.exportMonthlyPlanPerson(monthlyPlanVo);
MonthPlanExcelExporter.exportToExcel(response, list, 2025, 10, "10月运检人员安排");
int year = LocalDate.now().getYear();
int month = LocalDate.now().getMonthValue();
MonthPlanExcelExporter.exportToExcel(response, list, year, month, month+"月运检人员安排");
}
@Log(title = "导出工作量汇总表", businessType = BusinessType.EXPORT)

10
bonus-business/src/main/java/com/bonus/digital/dao/MonthlyPlanVo.java
View File

@ -87,11 +87,21 @@ public class MonthlyPlanVo {
*/
private Integer planSkilledWorkerNum;
/**
* 计划投入熟练工工日
*/
private Integer planSkilledWorkerDay;
/**
* 计划投入辅助工人员数量
*/
private Integer planAuxiliaryWorkerNum;
/**
* 计划投入辅助工人工日
*/
private Integer planAuxiliaryWorkerDay;
/**
* 计划投入分包车辆数量
*/

8
bonus-business/src/main/java/com/bonus/digital/dao/WorkloadVo.java
View File

@ -12,17 +12,17 @@ public class WorkloadVo {
/**
* 工作量id
*/
private int workloadId;
private Integer workloadId;
/**
* 计划填报id
*/
private int planId;
private Integer planId;
/**
* 工作量类别id
*/
private int workloadCategoryId;
private Integer workloadCategoryId;
/**
* 工作量类别名称
@ -37,7 +37,7 @@ public class WorkloadVo {
/**
*工作量
*/
private int workloadNum;
private Integer workloadNum;
/**
* 数据来源：0月计划：1日计划

3
bonus-business/src/main/java/com/bonus/digital/mapper/WorkloadCategoryMapper.java
View File

@ -1,6 +1,7 @@
package com.bonus.digital.mapper;
import com.bonus.digital.dao.WorkloadCategoryVo;
import com.bonus.digital.dao.WorkloadVo;
import java.util.List;
@ -12,4 +13,6 @@ public interface WorkloadCategoryMapper {
int delWorkloadCategory(WorkloadCategoryVo workloadCategoryVo);
int updateWorkloadCategory(WorkloadCategoryVo workloadCategoryVo);
List<WorkloadVo> getWorkloadList(WorkloadVo workloadVo);
}

40
bonus-business/src/main/java/com/bonus/digital/service/impl/MonthlyPlanServiceImpl.java
View File

@ -5,6 +5,7 @@ import com.bonus.common.utils.StringUtils;
import com.bonus.digital.dao.*;
import com.bonus.digital.mapper.MonthlyPlanMapper;
import com.bonus.digital.mapper.PersonnelMapper;
import com.bonus.digital.mapper.WorkloadCategoryMapper;
import com.bonus.digital.service.MonthlyPlanService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -30,27 +31,38 @@ public class MonthlyPlanServiceImpl implements MonthlyPlanService {
@Resource
private PersonnelMapper personnelMapper;
@Resource
private WorkloadCategoryMapper workloadCategoryMapper;
/**
* 月计划列表
*/
@Override
public List<MonthlyPlanVo> getPlanMajorList(MonthlyPlanVo monthlyPlanVo) {
List<MonthlyPlanVo> monthlyPlanVoList = monthlyPlanMapper.getPlanMajorList(monthlyPlanVo);
for (MonthlyPlanVo monthlyPlanVo2 : monthlyPlanVoList) {
if (StringUtils.isNotEmpty(monthlyPlanVo2.getPlanPersonnel())){
//获取每个月计划投入的管理人员
List<String> plannedIdList = Arrays.asList(monthlyPlanVo2.getPlanPersonnel().split(","));
PersonnelVo personnelVo = new PersonnelVo();
personnelVo.setIdList(plannedIdList);
List<PersonnelVo> plannedList = personnelMapper.getPersonnelList(personnelVo);
monthlyPlanVo2.setPersonneltList(plannedList);
//获取人员安排信息
List<PersonnelArrangementVo> personnelArrangementVoList = monthlyPlanMapper.getPersonnelArrangementList(monthlyPlanVo2);
monthlyPlanVo2.setPersonnelArrangementList(personnelArrangementVoList);
try {
List<MonthlyPlanVo> monthlyPlanVoList = monthlyPlanMapper.getPlanMajorList(monthlyPlanVo);
for (MonthlyPlanVo monthlyPlanVo2 : monthlyPlanVoList) {
if (StringUtils.isNotEmpty(monthlyPlanVo2.getPlanPersonnel())){
//获取每个月计划投入的管理人员
List<String> plannedIdList = Arrays.asList(monthlyPlanVo2.getPlanPersonnel().split(","));
PersonnelVo personnelVo = new PersonnelVo();
personnelVo.setIdList(plannedIdList);
List<PersonnelVo> plannedList = personnelMapper.getPersonnelList(personnelVo);
monthlyPlanVo2.setPersonneltList(plannedList);
//获取人员安排信息
List<PersonnelArrangementVo> personnelArrangementVoList = monthlyPlanMapper.getPersonnelArrangementList(monthlyPlanVo2);
monthlyPlanVo2.setPersonnelArrangementList(personnelArrangementVoList);
}
WorkloadVo workloadVo = new WorkloadVo();
workloadVo.setPlanId(monthlyPlanVo2.getMonthlyPlanId());
workloadVo.setDataSource("0");
List<WorkloadVo> workloadVoList = workloadCategoryMapper.getWorkloadList(workloadVo);
monthlyPlanVo2.setWorkloadList(workloadVoList);
}
return monthlyPlanVoList;
}catch (Exception e){
throw new RuntimeException(e);
}
return monthlyPlanVoList;
}
/**

6
bonus-business/src/main/resources/mapper/MonthPlanMapper.xml
View File

@ -66,9 +66,15 @@
<if test="planSkilledWorkerNum!= null " >
plan_skilled_worker_num=#{planSkilledWorkerNum},
</if>
<if test="planSkilledWorkerDay!= null " >
plan_skilled_worker_day=#{planSkilledWorkerDay},
</if>
<if test="planAuxiliaryWorkerNum!= null " >
plan_auxiliary_worker_num=#{planAuxiliaryWorkerNum},
</if>
<if test="planAuxiliaryWorkerDay!= null " >
plan_auxiliary_worker_day=#{planAuxiliaryWorkerDay},
</if>
<if test="planSubCarNum!= null " >
plan_sub_car_num=#{planSubCarNum},
</if>

4
bonus-business/src/main/resources/mapper/WorkloadCategoryMapper.xml
View File

@ -39,4 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and workload_category_name like concat('%',#{workloadCategoryName},'%')
</if>
</select>
<select id="getWorkloadList" resultType="com.bonus.digital.dao.WorkloadVo">
select workload_id,plan_id,workload_category_id,workload_category_name,unit_price,workload_num,data_source
from tb_workload where plan_id = #{planId} and data_source = #{dataSource}
</select>
</mapper>