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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
LHD_HY 2025-12-19 17:39:06 +08:00
parent 8b3dcf419b 85592af4e4
commit 4b39cd5312
13 changed files with 233 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,3 @@
/*
package com.bonus.digital.controller; package com.bonus.digital.controller;
import com.bonus.business.controller.tool.MonthPlanExcelExporter; import com.bonus.business.controller.tool.MonthPlanExcelExporter;
@ -11,24 +10,15 @@ import com.bonus.digital.dao.DayPlanVo;
import com.bonus.digital.dao.ExportMonthPlanPersonVo; import com.bonus.digital.dao.ExportMonthPlanPersonVo;
import com.bonus.digital.dao.MonthlyPlanVo; import com.bonus.digital.dao.MonthlyPlanVo;
import com.bonus.digital.service.DayPlanService; import com.bonus.digital.service.DayPlanService;
import com.bonus.digital.service.MonthlyPlanService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
*/
/**
* @author 马三炮
* @date 2025/12/16
*//*
@Slf4j @Slf4j
@RestController @RestController
@ -38,12 +28,8 @@ public class DayPlanController extends BaseController {
@Resource @Resource
private DayPlanService dayPlanService; private DayPlanService dayPlanService;
*/ //日计划列表
/** @PreAuthorize("@ss.hasPermi('day:plan:list')")
* 月计划列表
*//*
@PreAuthorize("@ss.hasPermi('monthly:plan:list')")
@GetMapping("/getDayPlanList") @GetMapping("/getDayPlanList")
public TableDataInfo getMonthlyPlanList(DayPlanVo dayPlanVo) { public TableDataInfo getMonthlyPlanList(DayPlanVo dayPlanVo) {
try { try {
@ -55,16 +41,12 @@ public class DayPlanController extends BaseController {
} }
} }
*/ //新增日计划
/** @PreAuthorize("@ss.hasPermi('day:plan:add')")
* 新增月计划 @PostMapping("/addDayPlan")
*//* public AjaxResult addMonthlyPlan(@RequestBody DayPlanVo dayPlanVo) {
@PreAuthorize("@ss.hasPermi('monthly:plan:add')")
@PostMapping("/addMonthlyPlan")
public AjaxResult addMonthlyPlan(MonthlyPlanVo monthlyPlanVo) {
try { try {
int res = dayPlanService.addMonthlyPlanList(monthlyPlanVo); int res = dayPlanService.addMonthlyPlan(dayPlanVo);
if (res > 0) { if (res > 0) {
return AjaxResult.success(); return AjaxResult.success();
} else { } else {
@ -75,16 +57,12 @@ public class DayPlanController extends BaseController {
} }
} }
*/ //删除日计划
/** @PreAuthorize("@ss.hasPermi('day:plan:del')")
* 删除月计划 @PostMapping("/delDayPlan")
*//* public AjaxResult delMonthlyPlan(@RequestBody DayPlanVo dayPlanVo) {
@PreAuthorize("@ss.hasPermi('monthly:plan:del')")
@PostMapping("/delMonthlyPlan")
public AjaxResult delMonthlyPlan(MonthlyPlanVo monthlyPlanVo) {
try { try {
int res = dayPlanService.delMonthlyPlanList(monthlyPlanVo); int res = dayPlanService.delDayPlan(dayPlanVo);
if (res > 0) { if (res > 0) {
return AjaxResult.success(); return AjaxResult.success();
} else { } else {
@ -95,16 +73,12 @@ public class DayPlanController extends BaseController {
} }
} }
*/ // 修改日计划
/** @PreAuthorize("@ss.hasPermi('day:plan:update')")
* 修改月计划 @PostMapping("/updateDayPlan")
*//* public AjaxResult updateMonthlyPlan(@RequestBody DayPlanVo dayPlanVo) {
@PreAuthorize("@ss.hasPermi('monthly:plan:update')")
@PostMapping("/updateMonthlyPlan")
public AjaxResult updateMonthlyPlan(MonthlyPlanVo monthlyPlanVo) {
try { try {
int res = dayPlanService.updateMonthlyPlan(monthlyPlanVo); int res = dayPlanService.updateDayPlan(dayPlanVo);
if (res > 0) { if (res > 0) {
return AjaxResult.success(); return AjaxResult.success();
} else { } else {
@ -114,13 +88,4 @@ public class DayPlanController extends BaseController {
return AjaxResult.error("系统异常，请联系管理员"); return AjaxResult.error("系统异常，请联系管理员");
} }
} }
@Log(title = "导出人员安排表", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('monthly:plan:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, MonthlyPlanVo monthlyPlanVo) throws IOException {
List<ExportMonthPlanPersonVo> list = dayPlanService.exportMonthlyPlanPerson(monthlyPlanVo);
MonthPlanExcelExporter.exportToExcel(response, list, 2025, 10, "10月运检人员安排");
}
} }
*/

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

@ -4,6 +4,7 @@ import com.bonus.common.core.controller.BaseController;
import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.domain.AjaxResult;
import com.bonus.common.core.page.TableDataInfo; import com.bonus.common.core.page.TableDataInfo;
import com.bonus.digital.dao.InspectionStationVo; import com.bonus.digital.dao.InspectionStationVo;
import com.bonus.digital.dao.PersonnelClassificationVo;
import com.bonus.digital.dao.PersonnelVo; import com.bonus.digital.dao.PersonnelVo;
import com.bonus.digital.dao.SelectDto; import com.bonus.digital.dao.SelectDto;
import com.bonus.digital.service.PersonnelService; import com.bonus.digital.service.PersonnelService;
@ -41,6 +42,8 @@ public class PersonnelController extends BaseController {
} }
} }
//人员所属下拉
//0：运检站1：项目部
@GetMapping("/getInspectionStationSelect") @GetMapping("/getInspectionStationSelect")
public AjaxResult getInspectionStationSelect(InspectionStationVo vo) { public AjaxResult getInspectionStationSelect(InspectionStationVo vo) {
try { try {
@ -50,6 +53,9 @@ public class PersonnelController extends BaseController {
return AjaxResult.error("接口异常"); return AjaxResult.error("接口异常");
} }
} }
//人员性质/人员分类/岗位下拉
// 0：人员分类1：人员性质2：岗位列表
@GetMapping("/getPersonnelClassificationSelect") @GetMapping("/getPersonnelClassificationSelect")
public AjaxResult getPersonnelClassificationSelect(InspectionStationVo vo) { public AjaxResult getPersonnelClassificationSelect(InspectionStationVo vo) {
try { try {

2
bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java
View File

@ -144,7 +144,7 @@ public class DayPlanVo {
/** /**
* 创建时间 * 创建时间
*/ */
private String createTime; private Date createTime;
/** /**
* 修改人 * 修改人

30
bonus-business/src/main/java/com/bonus/digital/dao/PersonnelVo.java
View File

@ -15,80 +15,80 @@ public class PersonnelVo {
/** /**
* 人员id * 人员id
*/ */
private int id; private Integer id;
/** /**
* 人员所属 * 人员所属
*/ */
private int inspectionStationId; private Integer inspectionStationId;
/** /**
* 单位名称 * 单位名称
*/ */
private String inspectionStationName; private String inspectionStationName;
/** /**
* 姓名 * 姓名
*/ */
private String name; private String name;
/** /**
* 性别 * 性别
*/ */
private String sex; private String sex;
/** /**
* 电话 * 电话
*/ */
private String phone; private String phone;
/** /**
* 岗位 * 岗位
*/ */
private int positionId; private Integer positionId;
/** /**
* 岗位 * 岗位
*/ */
private String positionName; private String positionName;
/** /**
* 人员性质 * 人员性质
*/ */
private int personnelNatureId; private Integer personnelNatureId;
/** /**
* 人员性质 * 人员性质
*/ */
private String personnelNatureName; private String personnelNatureName;
/** /**
* 人员分类 * 人员分类
*/ */
private int personnelClassificationId; private Integer personnelClassificationId;
/** /**
* 人员分类 * 人员分类
*/ */
private String personnelClassificationName; private String personnelClassificationName;
/** /**
* 长期借调1是0否 * 长期借调1是0否
*/ */
private String longTermSecondment; private String longTermSecondment;
/** /**
* 是否有效1有效0无效 * 是否有效1有效0无效
*/ */
private String isActive; private String isActive;
/** /**
* 创建人 * 创建人
*/ */
private String createUser; private String createUser;
/** /**
* 创建时间 * 创建时间
*/ */

21
bonus-business/src/main/java/com/bonus/digital/mapper/DayPlanMapper.java Normal file
View File

@ -0,0 +1,21 @@
package com.bonus.digital.mapper;
import com.bonus.digital.dao.DayPlanVo;
import com.bonus.digital.dao.MonthlyPlanVo;
import java.util.List;
/**
* @Author：liang.chao
* @Date：2025/12/18 - 13:19
*/
public interface DayPlanMapper {
Integer addMonthlyPlan(DayPlanVo dayPlanVo);
Integer delDayPlan(DayPlanVo dayPlanVo);
Integer updateDayPlan(DayPlanVo dayPlanVo);
List<DayPlanVo> getDayPlanList(DayPlanVo dayPlanVo);
}

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

@ -68,7 +68,5 @@ public interface MonthlyPlanMapper {
*/ */
int updateMonthlyPlan(MonthlyPlanVo monthlyPlanVo); int updateMonthlyPlan(MonthlyPlanVo monthlyPlanVo);
List<MonthlyPlanVo> getMonthlyPlanPerson(MonthlyPlanVo monthlyPlanVo);
List<MonthlyPlanVo> getPlanMajorListByMonth(MonthlyPlanVo monthlyPlanVo); List<MonthlyPlanVo> getPlanMajorListByMonth(MonthlyPlanVo monthlyPlanVo);
} }

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

@ -16,19 +16,19 @@ public interface PersonnelMapper {
/** /**
* 新增人员 * 新增人员
*/ */
int addPersonnel(PersonnelVo personnelVo); Integer addPersonnel(PersonnelVo personnelVo);
/** /**
* 删除人员 * 删除人员
*/ */
int delPersonnel(PersonnelVo personnelVo); Integer delPersonnel(PersonnelVo personnelVo);
/** /**
* 修改人员 * 修改人员
*/ */
int updatePersonnel(PersonnelVo personnelVo); Integer updatePersonnel(PersonnelVo personnelVo);
List<SelectDto> getInspectionStationSelect(@Param("category") String category); List<SelectDto> getInspectionStationSelect(@Param("category") String category);
List<SelectDto> getPersonnelClassificationSelect(String category); List<SelectDto> getPersonnelClassificationSelect(@Param("category") String category);
} }

12
bonus-business/src/main/java/com/bonus/digital/service/DayPlanService.java
View File

@ -1,9 +1,21 @@
package com.bonus.digital.service; package com.bonus.digital.service;
import com.bonus.digital.dao.DayPlanVo;
import com.bonus.digital.dao.MonthlyPlanVo;
import java.util.List;
/** /**
* @Author：liang.chao * @Author：liang.chao
* @Date：2025/12/18 - 10:48 * @Date：2025/12/18 - 10:48
*/ */
public interface DayPlanService { public interface DayPlanService {
int addMonthlyPlan(DayPlanVo dayPlanVo);
int delDayPlan(DayPlanVo dayPlanVo);
int updateDayPlan(DayPlanVo dayPlanVo);
List<DayPlanVo> getDayPlanList(DayPlanVo dayPlanVo);
} }

31
bonus-business/src/main/java/com/bonus/digital/service/impl/DayPlanServiceImpl.java
View File

@ -1,12 +1,43 @@
package com.bonus.digital.service.impl; package com.bonus.digital.service.impl;
import com.bonus.common.utils.SecurityUtils;
import com.bonus.digital.dao.DayPlanVo;
import com.bonus.digital.dao.MonthlyPlanVo;
import com.bonus.digital.mapper.DayPlanMapper;
import com.bonus.digital.service.DayPlanService; import com.bonus.digital.service.DayPlanService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
/** /**
* @Author：liang.chao * @Author：liang.chao
* @Date：2025/12/18 - 10:48 * @Date：2025/12/18 - 10:48
*/ */
@Service @Service
public class DayPlanServiceImpl implements DayPlanService { public class DayPlanServiceImpl implements DayPlanService {
@Resource
private DayPlanMapper dayPlanMapper;
@Override
public int addMonthlyPlan(DayPlanVo dayPlanVo) {
dayPlanVo.setCreateUser(SecurityUtils.getUserId().toString());
dayPlanVo.setCreateTime(new Date());
return dayPlanMapper.addMonthlyPlan(dayPlanVo);
}
@Override
public int delDayPlan(DayPlanVo dayPlanVo) {
return dayPlanMapper.delDayPlan(dayPlanVo);
}
@Override
public int updateDayPlan(DayPlanVo dayPlanVo) {
return dayPlanMapper.updateDayPlan(dayPlanVo);
}
@Override
public List<DayPlanVo> getDayPlanList(DayPlanVo dayPlanVo) {
return dayPlanMapper.getDayPlanList(dayPlanVo);
}
} }

111
bonus-business/src/main/resources/mapper/DayPlanMapper.xml Normal file
View File

@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.digital.mapper.DayPlanMapper">
<insert id="addMonthlyPlan">
INSERT INTO tb_day_plan
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="dayPlan != null and dayPlan != ''">day_plan,</if>
<if test="plannedWorkload != null and plannedWorkload != ''">planned_workload,</if>
<if test="proposedPersonnel != null and proposedPersonnel != ''">proposed_personnel,</if>
<if test="proposedProficientPersonnel != null and proposedProficientPersonnel != ''">proposed_proficient_personnel,</if>
<if test="proposedProficientDay != null and proposedProficientDay != ''">proposed_proficient_day,</if>
<if test="proposedAssistancePersonnel != null and proposedAssistancePersonnel != ''">proposed_assistance_personnel,</if>
<if test="proposedAssistanceDay != null and proposedAssistanceDay != ''">proposed_assistance_day,</if>
<if test="proposedLongTimeCar != null and proposedLongTimeCar != ''">proposed_long_time_car,</if>
<if test="proposedTemporaryCar != null and proposedTemporaryCar != ''">proposed_temporary_car,</if>
<if test="proposedSubCar != null and proposedSubCar != ''">proposed_sub_car,</if>
<if test="actualProficientPersonnel != null and actualProficientPersonnel != ''">actual_proficient_personnel,</if>
<if test="actualAssistancePersonnel != null and actualAssistancePersonnel != ''">actual_assistance_personnel,</if>
<if test="actualPersonnel != null and actualPersonnel != ''">actual_personnel,</if>
<if test="actualLongTimeCar != null and actualLongTimeCar != ''">actual_long_time_car,</if>
<if test="actualTemporaryCar != null and actualTemporaryCar != ''">actual_temporary_car,</if>
<if test="actualSubCar != null and actualSubCar != ''">actual_sub_car,</if>
<if test="actualWorkContent != null and actualWorkContent != ''">actual_work_content,</if>
<if test="actualWorkload != null and actualWorkload != ''">actual_workload,</if>
<if test="completionPercentage != null and completionPercentage != ''">completion_percentage,</if>
<if test="planCompletionStatus != null and planCompletionStatus != ''">plan_completion_status,</if>
<if test="planChanges != null and planChanges != ''">plan_changes,</if>
<if test="createUser != null and createUser != ''">create_user,</if>
<if test="createTime != null">create_time,</if>
<if test="status != null and status != ''">status,</if>
<if test="dayPlanType != null and dayPlanType != ''">day_plan_type,</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="dayPlan != null and dayPlan != ''">#{dayPlan},</if>
<if test="plannedWorkload != null and plannedWorkload != ''">#{plannedWorkload},</if>
<if test="proposedPersonnel != null and proposedPersonnel != ''">#{proposedPersonnel},</if>
<if test="proposedProficientPersonnel != null and proposedProficientPersonnel != ''">#{proposedProficientPersonnel},</if>
<if test="proposedProficientDay != null and proposedProficientDay != ''">#{proposedProficientDay},</if>
<if test="proposedAssistancePersonnel != null and proposedAssistancePersonnel != ''">#{proposedAssistancePersonnel},</if>
<if test="proposedAssistanceDay != null and proposedAssistanceDay != ''">#{proposedAssistanceDay},</if>
<if test="proposedLongTimeCar != null and proposedLongTimeCar != ''">#{proposedLongTimeCar},</if>
<if test="proposedTemporaryCar != null and proposedTemporaryCar != ''">#{proposedTemporaryCar},</if>
<if test="proposedSubCar != null and proposedSubCar != ''">#{proposedSubCar},</if>
<if test="actualProficientPersonnel != null and actualProficientPersonnel != ''">#{actualProficientPersonnel},</if>
<if test="actualAssistancePersonnel != null and actualAssistancePersonnel != ''">#{actualAssistancePersonnel},</if>
<if test="actualPersonnel != null and actualPersonnel != ''">#{actualPersonnel},</if>
<if test="actualLongTimeCar != null and actualLongTimeCar != ''">#{actualLongTimeCar},</if>
<if test="actualTemporaryCar != null and actualTemporaryCar != ''">#{actualTemporaryCar},</if>
<if test="actualSubCar != null and actualSubCar != ''">#{actualSubCar},</if>
<if test="actualWorkContent != null and actualWorkContent != ''">#{actualWorkContent},</if>
<if test="actualWorkload != null and actualWorkload != ''">#{actualWorkload},</if>
<if test="completionPercentage != null and completionPercentage != ''">#{completionPercentage},</if>
<if test="planCompletionStatus != null and planCompletionStatus != ''">#{planCompletionStatus},</if>
<if test="planChanges != null and planChanges != ''">#{planChanges},</if>
<if test="createUser != null and createUser != ''">#{createUser},</if>
<if test="createTime != null">#{createTime},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="dayPlanType != null and dayPlanType != ''">#{dayPlanType},</if>
</trim>
</insert>
<update id="updateDayPlan">
UPDATE tb_day_plan
<trim prefix="SET" suffixOverrides=",">
<if test="monthlyPlanId != null">monthly_plan_id = #{monthlyPlanId},</if>
<if test="dayPlan != null and dayPlan != ''">day_plan = #{dayPlan},</if>
<if test="plannedWorkload != null and plannedWorkload != ''">planned_workload = #{plannedWorkload},</if>
<if test="proposedPersonnel != null and proposedPersonnel != ''">proposed_personnel = #{proposedPersonnel},</if>
<if test="proposedProficientPersonnel != null and proposedProficientPersonnel != ''">proposed_proficient_personnel = #{proposedProficientPersonnel},</if>
<if test="proposedProficientDay != null and proposedProficientDay != ''">proposed_proficient_day = #{proposedProficientDay},</if>
<if test="proposedAssistancePersonnel != null and proposedAssistancePersonnel != ''">proposed_assistance_personnel = #{proposedAssistancePersonnel},</if>
<if test="proposedAssistanceDay != null and proposedAssistanceDay != ''">proposed_assistance_day = #{proposedAssistanceDay},</if>
<if test="proposedLongTimeCar != null and proposedLongTimeCar != ''">proposed_long_time_car = #{proposedLongTimeCar},</if>
<if test="proposedTemporaryCar != null and proposedTemporaryCar != ''">proposed_temporary_car = #{proposedTemporaryCar},</if>
<if test="proposedSubCar != null and proposedSubCar != ''">proposed_sub_car = #{proposedSubCar},</if>
<if test="actualProficientPersonnel != null and actualProficientPersonnel != ''">actual_proficient_personnel = #{actualProficientPersonnel},</if>
<if test="actualAssistancePersonnel != null and actualAssistancePersonnel != ''">actual_assistance_personnel = #{actualAssistancePersonnel},</if>
<if test="actualPersonnel != null and actualPersonnel != ''">actual_personnel = #{actualPersonnel},</if>
<if test="actualLongTimeCar != null and actualLongTimeCar != ''">actual_long_time_car = #{actualLongTimeCar},</if>
<if test="actualTemporaryCar != null and actualTemporaryCar != ''">actual_temporary_car = #{actualTemporaryCar},</if>
<if test="actualSubCar != null and actualSubCar != ''">actual_sub_car = #{actualSubCar},</if>
<if test="actualWorkContent != null and actualWorkContent != ''">actual_work_content = #{actualWorkContent},</if>
<if test="actualWorkload != null and actualWorkload != ''">actual_workload = #{actualWorkload},</if>
<if test="completionPercentage != null and completionPercentage != ''">completion_percentage = #{completionPercentage},</if>
<if test="planCompletionStatus != null and planCompletionStatus != ''">plan_completion_status = #{planCompletionStatus},</if>
<if test="planChanges != null and planChanges != ''">plan_changes = #{planChanges},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateUser != null and updateUser != ''">update_user = #{updateUser},</if>
<if test="status != null and status != ''">status = #{status},</if>
</trim>
WHERE day_plan_id = #{dayPlanId}
</update>
<delete id="delDayPlan">
update tb_day_plan set is_active = '0' where day_plan_id = #{dayPlanId}
</delete>
<select id="getDayPlanList" resultType="com.bonus.digital.dao.DayPlanVo">
SELECT
tdp.*
FROM
tb_day_plan tdp
LEFT JOIN tb_monthly_plan tmp ON tdp.monthly_plan_id = tmp.monthly_plan_id
LEFT JOIN tb_plan_management tpm ON tmp.plan_management_id = tpm.plan_management_id
WHERE
tdp.is_active = '1'
<if test="startTime != null and endTime != ''">
AND DATE_FORMAT( tdp.day_plan, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
</select>
</mapper>

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

@ -117,17 +117,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tmp.actual_working_day tmp.actual_working_day
from tb_monthly_plan tmp from tb_monthly_plan tmp
left join tb_plan_major tpm on tmp.plan_major_id = tpm.plan_major_id left join tb_plan_major tpm on tmp.plan_major_id = tpm.plan_major_id
left join tb_plan_major tpm2 on tmp.plan_major_id = tpm2.plan_major_id
left join tb_plan_major tpm3 on tmp.plan_major_id = tpm3.plan_major_id
where tmp.is_active = '1' where tmp.is_active = '1'
</select> </select>
<select id="getPersonnelArrangementList" resultType="com.bonus.digital.dao.PersonnelArrangementVo"> <select id="getPersonnelArrangementList" resultType="com.bonus.digital.dao.PersonnelArrangementVo">
select personnel_arrangement_id,monthly_plan_id,"day",personnel_names select personnel_arrangement_id,monthly_plan_id,"day",personnel_names
from tb_personnel_arrangement where monthly_plan_id = #{monthlyPlanId} from tb_personnel_arrangement where monthly_plan_id = #{monthlyPlanId}
</select>
<select id="getMonthlyPlanPerson" resultType="com.bonus.digital.dao.MonthlyPlanVo">
</select> </select>
<select id="getPlanMajorListByMonth" resultType="com.bonus.digital.dao.MonthlyPlanVo"> <select id="getPlanMajorListByMonth" resultType="com.bonus.digital.dao.MonthlyPlanVo">
select tmp.inspection_station_name, select tmp.inspection_station_name,

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

@ -6,14 +6,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="addPersonnel"> <insert id="addPersonnel">
insert into tb_personnel (inspection_station_id,NAME,sex,phone,position_id,personnel_nature_id, insert into tb_personnel (inspection_station_id,NAME,sex,phone,position_id,personnel_nature_id,
personnel_classification_id,long_term_secondment,create_user,create_time) personnel_classification_id,long_term_secondment,create_user,create_time)
values (#{inspectionStationId},#{name},#{sex},#{phone},#{positionId}#{personnelNatureId}, values (#{inspectionStationId},#{name},#{sex},#{phone},#{positionId},#{personnelNatureId},
#{personnelClassificationId},#{longTermSecondment},#{createUser},#{createTime}) #{personnelClassificationId},#{longTermSecondment},#{createUser},#{createTime})
</insert> </insert>
<update id="updatePersonnel"> <update id="updatePersonnel">
update tb_personnel update tb_personnel
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="inspectionStationId!= null " > <if test="inspectionStationId!= null " >
inspectionStationId=#{inspectionStationId}, inspection_station_id = #{inspectionStationId},
</if> </if>
<if test="name!= null " > <if test="name!= null " >
NAME=#{name}, NAME=#{name},
@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time=#{updateTime}, update_time=#{updateTime},
</if> </if>
</trim> </trim>
where personnel_classification_id = #{personnelClassificationId} where id = #{id}
</update> </update>
<delete id="delPersonnel"> <delete id="delPersonnel">
update tb_personnel set is_active ='0' where id = #{id} update tb_personnel set is_active ='0' where id = #{id}
@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getPersonnelList" resultType="com.bonus.digital.dao.PersonnelVo"> <select id="getPersonnelList" resultType="com.bonus.digital.dao.PersonnelVo">
select tis.id, select tis.id,
tis.inspection_station_id as inspectionStationId, tis.inspection_station_id as inspectionStationId,
tis2.inspection_station_name as inspectionStationName,
tis.name, tis.name,
tis.sex, tis.sex,
tis.phone, tis.phone,
@ -91,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
) )
</if> </if>
and tis.is_active = '1'
</where> </where>
</select> </select>
<select id="getInspectionStationSelect" resultType="com.bonus.digital.dao.SelectDto"> <select id="getInspectionStationSelect" resultType="com.bonus.digital.dao.SelectDto">

18
bonus-business/src/main/resources/mapper/PlanManagementMapper.xml
View File

@ -47,16 +47,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<select id="getPlanManagementList" resultType="com.bonus.digital.dao.PlanManagementVo"> <select id="getPlanManagementList" resultType="com.bonus.digital.dao.PlanManagementVo">
select tis.plan_management_id, select tpm.plan_management_id,
tis.plan_management_month, tpm.plan_management_month,
tis.project_name, tpm.project_name,
tis.work_content, tpm.work_content,
tis.inspection_station_id, tpm.inspection_station_id,
tis2.inspection_station_name as inspectionStationName tis2.inspection_station_name as inspectionStationName
tis.stare_date, tpm.stare_date,
tis.end_date, tpm.end_date,
tis.remark, tpm.remark,
tis.create_user tpm.create_user
from tb_plan_management tpm from tb_plan_management tpm
left join tb_inspection_station tis2 on tpm.inspection_station_id = tis2.inspection_station_id left join tb_inspection_station tis2 on tpm.inspection_station_id = tis2.inspection_station_id
where category = #{category} and is_active = '1' where category = #{category} and is_active = '1'