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

bug修改

This commit is contained in:
liang.chao 2024-04-20 17:29:05 +08:00
parent 8c7453aa23
commit b1fee78651
9 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java
View File

@ -117,6 +117,7 @@ public class SltAgreementInfo {
*/
private String sltType;
private String applyId;
private String keyWord;
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
View File

@ -264,4 +264,6 @@ public class TmTask implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date estimateLeaseTime;
private Integer souceByRefuse;
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
View File

@ -307,7 +307,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
//删除back_check_details
int res = deleteBcd(record);
if (res == 0) {
throw new RuntimeException("删除back_check_details异常");
throw new RuntimeException("该机具未领用，撤回失败");
}
return res;
}

11
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -500,12 +500,6 @@ public class TmTaskServiceImpl implements TmTaskService {
for (TmTask tmTask : tmTaskList) {
int count = 0;
if (tmTask != null) {
if (tmTask.getTaskStatus() == 31) {
tmTask.setTaskName("机具分公司审核");
}
if (tmTask.getTaskStatus() == 32) {
tmTask.setTaskName("施工部审核");
}
// 去查询任务分单表
List<LeaseApplyInfo> collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
// 对领料任务集合查询具体详情
@ -1099,6 +1093,11 @@ public class TmTaskServiceImpl implements TmTaskService {
leaseApplyInfo.setCode(task.getLeaseApplyInfoList().get(0).getCode());
leaseApplyInfo.setLeasePerson(leasePerson);
leaseApplyInfo.setPhone(phone);
if (task.getTaskStatus() == 32 && task.getSouceByRefuse() == 1) {
leaseApplyInfo.setDeptAuditBy(task.getLeaseApplyInfoList().get(0).getDeptAuditBy());
leaseApplyInfo.setDeptAuditTime(task.getLeaseApplyInfoList().get(0).getDeptAuditTime());
leaseApplyInfo.setDeptAuditRemark(task.getLeaseApplyInfoList().get(0).getDeptAuditRemark());
}
leaseApplyInfo.setRemark(remark);
leaseApplyInfo.setType(task.getLeaseApplyInfoList().get(0).getType());
leaseApplyInfo.setCompanyId(leaseApplyDetail.getCompanyId());

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
View File

@ -63,9 +63,9 @@ public class WorkSiteDirectManageController extends BaseController {
*/
@ApiOperation(value = "根据协议Id查询在用数据")
@GetMapping("/getUseringData")
public TableDataInfo getUseringData(String agreementId) {
public TableDataInfo getUseringData(SltAgreementInfo sltAgreementInfo) {
startPage();
List<SltAgreementInfo> useringData = workSiteDirectManageService.getUseringData(agreementId);
List<SltAgreementInfo> useringData = workSiteDirectManageService.getUseringData(sltAgreementInfo);
return getDataTable(useringData);
}
@ -137,8 +137,8 @@ public class WorkSiteDirectManageController extends BaseController {
@ApiOperation(value = "查看详情")
@GetMapping("/getInfo")
public AjaxResult getInfo(String id) {
return AjaxResult.success(workSiteDirectManageService.getInfoById(id));
public AjaxResult getInfo(SltAgreementInfo sltAgreementInfo) {
return AjaxResult.success(workSiteDirectManageService.getInfoById(sltAgreementInfo));
}
}

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java
View File

@ -21,10 +21,10 @@ public interface WorkSiteDirectManageMapper {
/**
* 根据协议id查询在用数据
*
* @param agreementId
* @param
* @return
*/
List<SltAgreementInfo> getUseringData(String agreementId);
List<SltAgreementInfo> getUseringData(SltAgreementInfo sltAgreementInfo);
int saveDirectApplyInfo(DirectApplyInfo directApplyInfo);
@ -58,9 +58,9 @@ public interface WorkSiteDirectManageMapper {
int insertBackApplyInfo(TmTask task);
DirectApplyInfo getInfoById(String id);
DirectApplyInfo getInfoById(SltAgreementInfo sltAgreementInfo);
List<DirectApplyDetails> getDetailById(String id);
List<DirectApplyDetails> getDetailById(SltAgreementInfo sltAgreementInfo);
List<DirectApplyInfo> getListAll();
}

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java
View File

@ -14,7 +14,7 @@ import java.util.List;
*/
public interface WorkSiteDirectManageService {
List<SltAgreementInfo> getUseringData(String agreementId);
List<SltAgreementInfo> getUseringData(SltAgreementInfo sltAgreementInfo);
int saveDirectApplyInfo(DirectApplyInfo directApplyInfos);
int saveDirectApplyDetails(DirectApplyDetails directApplyInfos);
@ -42,7 +42,7 @@ public interface WorkSiteDirectManageService {
int insertBackCheckDetails(List<BackApplyInfo> backApplyDetails);
DirectApplyInfo getInfoById(String id);
DirectApplyInfo getInfoById(SltAgreementInfo sltAgreementInfo);
int passDirectApplyInfoDetails(DirectPassApplyInfoDetails directApplyInfoDetails);
}

10
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
View File

@ -51,8 +51,8 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
@Override
public List<SltAgreementInfo> getUseringData(String agreementId) {
return workSiteDirectManageMapper.getUseringData(agreementId);
public List<SltAgreementInfo> getUseringData(SltAgreementInfo sltAgreementInfo) {
return workSiteDirectManageMapper.getUseringData(sltAgreementInfo);
}
@Override
@ -331,9 +331,9 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
}
@Override
public DirectApplyInfo getInfoById(String id) {
DirectApplyInfo directApplyInfo = workSiteDirectManageMapper.getInfoById(id);
List<DirectApplyDetails> detailById = workSiteDirectManageMapper.getDetailById(id);
public DirectApplyInfo getInfoById(SltAgreementInfo sltAgreementInfo) {
DirectApplyInfo directApplyInfo = workSiteDirectManageMapper.getInfoById(sltAgreementInfo);
List<DirectApplyDetails> detailById = workSiteDirectManageMapper.getDetailById(sltAgreementInfo);
directApplyInfo.setDirectApplyDetails(detailById);
return directApplyInfo;
}

8
sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
View File

@ -380,6 +380,10 @@
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN ma_machine mm on sai.ma_id = mm.ma_id
where sai.agreement_id = #{agreementId} and sai.status = '0'
<if test="keyWord != null and keyWord != ''">
and (mt2.type_name like concat('%', #{keyWord}, '%') or
mt.type_name like concat('%', #{keyWord}, '%'))
</if>
GROUP BY
sai.ma_id,sai.type_id
</select>
@ -491,6 +495,10 @@
WHERE
dai.id = #{id}
AND sai.STATUS = '0'
<if test="keyWord != null and keyWord != ''">
and (mt2.type_name like concat('%', #{keyWord}, '%') or
mt.type_name like concat('%', #{keyWord}, '%'))
</if>
GROUP BY
dad.id,sai.type_id
</select>