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

代码提交

This commit is contained in:
liang.chao 2025-12-18 11:19:21 +08:00
parent 6343e99f19
commit 1be419b046
15 changed files with 275 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java
View File

@ -1,3 +1,4 @@
/*
package com.bonus.digital.controller;
import com.bonus.business.controller.tool.MonthPlanExcelExporter;
@ -6,8 +7,10 @@ import com.bonus.common.core.controller.BaseController;
import com.bonus.common.core.domain.AjaxResult;
import com.bonus.common.core.page.TableDataInfo;
import com.bonus.common.enums.BusinessType;
import com.bonus.digital.dao.DayPlanVo;
import com.bonus.digital.dao.ExportMonthPlanPersonVo;
import com.bonus.digital.dao.MonthlyPlanVo;
import com.bonus.digital.service.DayPlanService;
import com.bonus.digital.service.MonthlyPlanService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
@ -21,41 +24,47 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
*/
/**
* @author 马三炮
* @date 2025/12/16
*/
*//*
@Slf4j
@RestController
@RequestMapping("/dayPlan")
public class DayPlanController extends BaseController {
@Resource
private MonthlyPlanService monthlyPlanService;
private DayPlanService dayPlanService;
/**
*/
/**
* 月计划列表
*/
*//*
@PreAuthorize("@ss.hasPermi('monthly:plan:list')")
@GetMapping("/getMonthlyPlanList")
public TableDataInfo getMonthlyPlanList(MonthlyPlanVo monthlyPlanVo) {
@GetMapping("/getDayPlanList")
public TableDataInfo getMonthlyPlanList(DayPlanVo dayPlanVo) {
try {
startPage();
List<MonthlyPlanVo> list = monthlyPlanService.getPlanMajorList(monthlyPlanVo);
List<DayPlanVo> list = dayPlanService.getDayPlanList(dayPlanVo);
return getDataTable(list);
} catch (Exception e) {
return getDataTable(null);
}
}
/**
*/
/**
* 新增月计划
*/
*//*
@PreAuthorize("@ss.hasPermi('monthly:plan:add')")
@PostMapping("/addMonthlyPlan")
public AjaxResult addMonthlyPlan(MonthlyPlanVo monthlyPlanVo) {
try {
int res = monthlyPlanService.addMonthlyPlanList(monthlyPlanVo);
int res = dayPlanService.addMonthlyPlanList(monthlyPlanVo);
if (res > 0) {
return AjaxResult.success();
} else {
@ -66,14 +75,16 @@ public class DayPlanController extends BaseController {
}
}
/**
*/
/**
* 删除月计划
*/
*//*
@PreAuthorize("@ss.hasPermi('monthly:plan:del')")
@PostMapping("/delMonthlyPlan")
public AjaxResult delMonthlyPlan(MonthlyPlanVo monthlyPlanVo) {
try {
int res = monthlyPlanService.delMonthlyPlanList(monthlyPlanVo);
int res = dayPlanService.delMonthlyPlanList(monthlyPlanVo);
if (res > 0) {
return AjaxResult.success();
} else {
@ -84,14 +95,16 @@ public class DayPlanController extends BaseController {
}
}
/**
*/
/**
* 修改月计划
*/
*//*
@PreAuthorize("@ss.hasPermi('monthly:plan:update')")
@PostMapping("/updateMonthlyPlan")
public AjaxResult updateMonthlyPlan(MonthlyPlanVo monthlyPlanVo) {
try {
int res = monthlyPlanService.updateMonthlyPlan(monthlyPlanVo);
int res = dayPlanService.updateMonthlyPlan(monthlyPlanVo);
if (res > 0) {
return AjaxResult.success();
} else {
@ -106,7 +119,8 @@ public class DayPlanController extends BaseController {
@PreAuthorize("@ss.hasPermi('monthly:plan:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, MonthlyPlanVo monthlyPlanVo) throws IOException {
List<ExportMonthPlanPersonVo> list = monthlyPlanService.exportMonthlyPlanPerson(monthlyPlanVo);
List<ExportMonthPlanPersonVo> list = dayPlanService.exportMonthlyPlanPerson(monthlyPlanVo);
MonthPlanExcelExporter.exportToExcel(response, list, 2025, 10, "10月运检人员安排");
}
}
*/

52
bonus-business/src/main/java/com/bonus/digital/controller/PersonnelController.java
View File

@ -4,8 +4,8 @@ import com.bonus.common.core.controller.BaseController;
import com.bonus.common.core.domain.AjaxResult;
import com.bonus.common.core.page.TableDataInfo;
import com.bonus.digital.dao.InspectionStationVo;
import com.bonus.digital.dao.PersonnelClassificationVo;
import com.bonus.digital.dao.PersonnelVo;
import com.bonus.digital.dao.SelectDto;
import com.bonus.digital.service.PersonnelService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
@ -31,14 +31,23 @@ public class PersonnelController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('tb:personnel:list')")
@GetMapping("/getPersonnelList")
public TableDataInfo getPersonnelList(PersonnelVo personnelVo)
{
public TableDataInfo getPersonnelList(PersonnelVo personnelVo) {
try {
startPage();
List<PersonnelVo> list = personnelService.getPersonnelList(personnelVo);
return getDataTable(list);
}catch (Exception e) {
return getDataTable(null);
} catch (Exception e) {
return getDataTable(null);
}
}
@GetMapping("/getInspectionStationSelect")
public AjaxResult getInspectionStationSelect(InspectionStationVo vo) {
try {
List<SelectDto> list = personnelService.getInspectionStationSelect(vo.getCategory());
return AjaxResult.success(list);
} catch (Exception e) {
return AjaxResult.error("接口异常");
}
}
@ -47,17 +56,16 @@ public class PersonnelController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('tb:personnel:add')")
@PostMapping("/addPersonnel")
public AjaxResult addPersonnel(@RequestBody PersonnelVo personnelVo)
{
public AjaxResult addPersonnel(@RequestBody PersonnelVo personnelVo) {
try {
int res = personnelService.addPersonnel(personnelVo);
int res = personnelService.addPersonnel(personnelVo);
if (res > 0) {
return AjaxResult.success();
}else {
} else {
return AjaxResult.error("新增失败");
}
}catch (Exception e) {
return AjaxResult.error("系统异常，请联系管理员");
} catch (Exception e) {
return AjaxResult.error("系统异常，请联系管理员");
}
}
@ -66,17 +74,16 @@ public class PersonnelController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('tb:personnel:del')")
@PostMapping("/delPersonnel")
public AjaxResult delPersonnel(@RequestBody PersonnelVo personnelVo)
{
public AjaxResult delPersonnel(@RequestBody PersonnelVo personnelVo) {
try {
int res = personnelService.delPersonnel(personnelVo);
int res = personnelService.delPersonnel(personnelVo);
if (res > 0) {
return AjaxResult.success();
}else {
} else {
return AjaxResult.error("删除失败");
}
}catch (Exception e) {
return AjaxResult.error("系统异常，请联系管理员");
} catch (Exception e) {
return AjaxResult.error("系统异常，请联系管理员");
}
}
@ -85,17 +92,16 @@ public class PersonnelController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('tb:personnel:update')")
@PostMapping("/updatePersonnel")
public AjaxResult updatePersonnel(@RequestBody PersonnelVo personnelVo)
{
public AjaxResult updatePersonnel(@RequestBody PersonnelVo personnelVo) {
try {
int res = personnelService.updatePersonnel(personnelVo);
int res = personnelService.updatePersonnel(personnelVo);
if (res > 0) {
return AjaxResult.success();
}else {
} else {
return AjaxResult.error("修改失败");
}
}catch (Exception e) {
return AjaxResult.error("系统异常，请联系管理员");
} catch (Exception e) {
return AjaxResult.error("系统异常，请联系管理员");
}
}

2
bonus-business/src/main/java/com/bonus/digital/controller/PlanMajorController.java
View File

@ -36,7 +36,7 @@ public class PlanMajorController extends BaseController {
{
try {
startPage();
List<PersonnelVo> list = planMajorService.getPlanMajorList(planMajorVo);
List<PlanMajorVo> list = planMajorService.getPlanMajorList(planMajorVo);
return getDataTable(list);
}catch (Exception e) {
return getDataTable(null);

158
bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java Normal file
View File

@ -0,0 +1,158 @@
package com.bonus.digital.dao;
import lombok.Data;
import java.util.Date;
/**
* @Author：liang.chao
* @Date：2025/12/18 - 10:50
*/
@Data
public class DayPlanVo {
/**
* 日计划id
*/
private Integer dayPlanId;
/**
* 月计划填报id
*/
private Integer monthlyPlanId;
/**
* 计划日期
*/
private String dayPlan;
/**
* 计划工作量
*/
private String plannedWorkload;
/**
* 拟投入作业人员
*/
private String proposedPersonnel;
/**
* 计划投入熟练工人员数量
*/
private String proposedProficientPersonnel;
/**
* 计划投入熟练工人员投入工日
*/
private String proposedProficientDay;
/**
* 计划投入辅助工人员数量
*/
private String proposedAssistancePersonnel;
/**
* 计划投入辅助工人员投入工日
*/
private String proposedAssistanceDay;
/**
* 拟投入长租车
*/
private String proposedLongTimeCar;
/**
* 拟投入临租车
*/
private String proposedTemporaryCar;
/**
* 拟投入分包车
*/
private String proposedSubCar;
/**
* 实际投入熟练工人员数量
*/
private String actualProficientPersonnel;
/**
* 实际投入检修辅助工数量
*/
private String actualAssistancePersonnel;
/**
* 实际投入作业人员
*/
private String actualPersonnel;
/**
* 实际投入长租车
*/
private String actualLongTimeCar;
/**
* 实际投入临租车
*/
private String actualTemporaryCar;
/**
* 实际投入分包车
*/
private String actualSubCar;
/**
* 实际完成工作内容
*/
private String actualWorkContent;
/**
* 实际完成工作量
*/
private String actualWorkload;
/**
* 完成比例
*/
private String completionPercentage;
/**
* 作业计划完成情况
*/
private String planCompletionStatus;
/**
* 计划变更及未完成情况说明
*/
private String planChanges;
/**
* 修改时间
*/
private String updateTime;
/**
* 是否有效1有效0无效
*/
private String isActive;
/**
* 创建人
*/
private String createUser;
/**
* 创建时间
*/
private String createTime;
/**
* 修改人
*/
private String updateUser;
/**
* 填写状态0:计划1：完成
*/
private String status;
}

13
bonus-business/src/main/java/com/bonus/digital/dao/SelectDto.java Normal file
View File

@ -0,0 +1,13 @@
package com.bonus.digital.dao;
import lombok.Data;
/**
* @Author：liang.chao
* @Date：2025/12/18 - 11:00
*/
@Data
public class SelectDto {
private String id;
private String value;
}

4
bonus-business/src/main/java/com/bonus/digital/mapper/PersonnelMapper.java
View File

@ -1,6 +1,8 @@
package com.bonus.digital.mapper;
import com.bonus.digital.dao.PersonnelVo;
import com.bonus.digital.dao.SelectDto;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -25,4 +27,6 @@ public interface PersonnelMapper {
* 修改人员
*/
int updatePersonnel(PersonnelVo personnelVo);
List<SelectDto> getInspectionStationSelect(@Param("category") String category);
}

2
bonus-business/src/main/java/com/bonus/digital/mapper/PlanMajorMapper.java
View File

@ -10,7 +10,7 @@ public interface PlanMajorMapper {
/**
* 列表类别0：计划专业1：业务分类2：计划类别
*/
List<PersonnelVo> getPlanMajorList(PlanMajorVo planMajorVo);
List<PlanMajorVo> getPlanMajorList(PlanMajorVo planMajorVo);
/**
* 新增类别0：计划专业1：业务分类2：计划类别

9
bonus-business/src/main/java/com/bonus/digital/service/DayPlanService.java Normal file
View File

@ -0,0 +1,9 @@
package com.bonus.digital.service;
/**
* @Author：liang.chao
* @Date：2025/12/18 - 10:48
*/
public interface DayPlanService {
}

3
bonus-business/src/main/java/com/bonus/digital/service/PersonnelService.java
View File

@ -1,6 +1,7 @@
package com.bonus.digital.service;
import com.bonus.digital.dao.PersonnelVo;
import com.bonus.digital.dao.SelectDto;
import java.util.List;
@ -26,4 +27,6 @@ public interface PersonnelService {
* 修改人员
*/
int updatePersonnel(PersonnelVo personnelVo);
List<SelectDto> getInspectionStationSelect(String category);
}

2
bonus-business/src/main/java/com/bonus/digital/service/PlanMajorService.java
View File

@ -11,7 +11,7 @@ public interface PlanMajorService {
/**
* 列表类别0：计划专业1：业务分类2：计划类别
*/
List<PersonnelVo> getPlanMajorList(PlanMajorVo planMajorVo);
List<PlanMajorVo> getPlanMajorList(PlanMajorVo planMajorVo);
/**
* 新增类别0：计划专业1：业务分类2：计划类别

12
bonus-business/src/main/java/com/bonus/digital/service/impl/DayPlanServiceImpl.java Normal file
View File

@ -0,0 +1,12 @@
package com.bonus.digital.service.impl;
import com.bonus.digital.service.DayPlanService;
import org.springframework.stereotype.Service;
/**
* @Author：liang.chao
* @Date：2025/12/18 - 10:48
*/
@Service
public class DayPlanServiceImpl implements DayPlanService {
}

6
bonus-business/src/main/java/com/bonus/digital/service/impl/PersonnelServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.bonus.digital.service.impl;
import com.bonus.common.utils.SecurityUtils;
import com.bonus.digital.dao.PersonnelVo;
import com.bonus.digital.dao.SelectDto;
import com.bonus.digital.mapper.PersonnelMapper;
import com.bonus.digital.service.PersonnelService;
import lombok.extern.slf4j.Slf4j;
@ -60,4 +61,9 @@ public class PersonnelServiceImpl implements PersonnelService {
personnelVo.setUpdateTime(new Date());
return personnelMapper.updatePersonnel(personnelVo);
}
@Override
public List<SelectDto> getInspectionStationSelect(String category) {
return personnelMapper.getInspectionStationSelect(category);
}
}

2
bonus-business/src/main/java/com/bonus/digital/service/impl/PlanMajorServiceImpl.java
View File

@ -30,7 +30,7 @@ public class PlanMajorServiceImpl implements PlanMajorService {
* 列表类别0：计划专业1：业务分类2：计划类别
*/
@Override
public List<PersonnelVo> getPlanMajorList(PlanMajorVo planMajorVo) {
public List<PlanMajorVo> getPlanMajorList(PlanMajorVo planMajorVo) {
return planMajorMapper.getPlanMajorList(planMajorVo);
}

5
bonus-business/src/main/resources/mapper/PersonnalMapper.xml
View File

@ -93,4 +93,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</where>
</select>
<select id="getInspectionStationSelect" resultType="com.bonus.digital.dao.SelectDto">
select inspection_station_id as id,
inspection_station_name as value
from tb_inspection_station where is_active = '1' and category = #{category}
</select>
</mapper>

2
bonus-business/src/main/resources/mapper/PlanMajorMapper.xml
View File

@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update tb_plan_major set is_active ='0' where plan_major_id = #{planMajorId}
</delete>
<select id="getPlanMajorList" resultType="com.bonus.digital.dao.PersonnelVo">
<select id="getPlanMajorList" resultType="com.bonus.digital.dao.PlanMajorVo">
select plan_major_id,plan_major_name,remark,category
from tb_plan_major where category = #{category} and is_active = '1'
<if test="planMajorName != null and planMajorName !=''">