bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

申请发布

This commit is contained in:
mashuai 2025-03-04 17:31:59 +08:00
parent fc6916a2da
commit 97213e6e60
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java
View File

@ -29,7 +29,9 @@ public enum TmTaskTypeEnum {
//安全工器具领料任务
TM_TASK_SAFE_LEASE(17, "安全工器具领料任务"),
// 宏源领料领料任务
TM_TASK_HY_LEASE(18, "宏源领料任务");
TM_TASK_HY_LEASE(18, "宏源领料任务"),
// 领用任务
TM_TASK_LEASE_APPLY(19, "领用任务");

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java
View File

@ -49,6 +49,9 @@ public class LeaseApplyDetails extends BaseEntity {
@ApiModelProperty(value = "规格型号id")
private Long typeId;
@ApiModelProperty(value = "三级id")
private Long thirdTypeId;
@ApiModelProperty(value = "规格型号id")
private Long taskId;

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
View File

@ -120,9 +120,9 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
} else {
taskStatus = LeaseTaskStatusEnum.LEASE_TASK_SUBMIT.getStatus();
}
int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId());
int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE_APPLY.getTaskTypeId());
String taskCode = leaseApplyRequestVo.getLeaseApplyInfo().getCode();
TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId(),
TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_LEASE_APPLY.getTaskTypeId(),
taskStatus,
leaseApplyRequestVo.getLeaseApplyInfo().getCompanyId(),thisMonthMaxOrder + 1, taskCode);
tmTask.setCreateTime(DateUtils.getNowDate());
@ -278,7 +278,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
leaseDeptInfo = mapper.getDeptIdByParentId(parentIdTemp);
}
if(!deptName.equals("")){
int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId());
int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE_APPLY.getTaskTypeId());
taskCode = genderTaskCodeTwo(thisMonthMaxOrder,leaseDeptInfo.getCompanySX());
leaseDeptInfo.setTaskCode(taskCode);
}

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java
View File

@ -137,8 +137,8 @@ public class TypeController extends BaseController {
@ApiOperation(value = "根据物资类型ID-查询子级下拉列表")
@RequiresPermissions("ma:type:list")
@GetMapping("/selectMaTypeListByTypeId")
public AjaxResult selectMaTypeListByTypeId(@NotNull(message = "物资类型ID不能为空") Long typeId) {
List<MaTypeSelectVo> list = typeService.getMaTypeSelectVoListByParentId(typeId);
public AjaxResult selectMaTypeListByTypeId(Type type) {
List<MaTypeSelectVo> list = typeService.getMaTypeSelectVoListByParentId(type.getTypeId());
return success(list);
}

2
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
View File

@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="leaseType != null and leaseType != ''"> and lai.lease_type = #{leaseType}</if>
<if test="estimateLeaseTime != null "> and lai.estimate_lease_time = #{estimateLeaseTime}</if>
<if test="costBearingParty != null and costBearingParty != ''"> and lai.cost_bearing_party = #{costBearingParty}</if>
and tt.task_status != '0'
and tt.task_type = '2'
</where>
GROUP BY lai.id
ORDER BY tt.task_status,tt.create_time desc

7
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
View File

@ -329,7 +329,7 @@
and sda.dict_type = 'lease_task_status'
left join ma_type mt on lad.type_id = mt.type_id and mt.del_flag = '0'
left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0'
where 1=1
where tt.task_type = '19'
<if test="code != null and code != ''">and lai.code = #{code}</if>
<if test="taskId != null ">and lai.task_id = #{taskId}</if>
<if test="leasePerson != null and leasePerson != ''">and lai.lease_person = #{leasePerson}</if>
@ -642,6 +642,7 @@
lad.parent_id AS parentId,
mt.type_id AS typeId,
mt.type_name AS typeName,
mt2.type_id AS thirdTypeId,
mt2.type_name AS maTypeName,
CASE
mt.manage_type
@ -721,8 +722,8 @@
and sda.dict_type = 'lease_task_status'
left join ma_type mt on lad.type_id = mt.type_id and mt.del_flag = '0'
left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0'
where
tt.task_status = '1'
where tt.task_type = '19'
and tt.task_status = '1'
<if test="taskId != null ">and lai.task_id = #{taskId}</if>
<if test="statusList != null and statusList.size() > 0">
and tt.task_status in