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

重庆新购无法绑定编码问题修改

This commit is contained in:
csyue 2024-06-07 13:29:51 +08:00
parent c57c539f51
commit b6a404753b
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
View File

@ -482,7 +482,7 @@ public class TmTaskController extends BaseController {
return AjaxResult.error("参数错误"); return AjaxResult.error("参数错误");
} }
if (SecurityUtils.getLoginUser() != null) { if (SecurityUtils.getLoginUser() != null) {
Long userid = SecurityUtils.getLoginUser().getUserid(); Long userid = SecurityUtils.getLoginUser().getSysUser().getUserId();
task.setUserId(String.valueOf(userid)); task.setUserId(String.valueOf(userid));
} }
// app端传1 // app端传1

10
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java
View File

@ -87,6 +87,9 @@ public class PurchaseCheckInfo extends BaseEntity
@ApiModelProperty(value = "采购状态") @ApiModelProperty(value = "采购状态")
@Excel(name = "状态") @Excel(name = "状态")
private String purchasingStatus; private String purchasingStatus;
/** 采购状态 */
@ApiModelProperty(value = "采购状态ID")
private Integer purchasingId;
/** 入库人员 */ /** 入库人员 */
@ApiModelProperty(value = "入库人员") @ApiModelProperty(value = "入库人员")
@ -210,6 +213,13 @@ public class PurchaseCheckInfo extends BaseEntity
public void setPurchasingStatus(String purchasingStatus) { public void setPurchasingStatus(String purchasingStatus) {
this.purchasingStatus = purchasingStatus; this.purchasingStatus = purchasingStatus;
} }
public Integer getPurchasingId() {
return purchasingId;
}
public void setPurchasingId(Integer purchasingId) {
this.purchasingId = purchasingId;
}
public String getPurchasingTypeName() { public String getPurchasingTypeName() {
return purchasingTypeName; return purchasingTypeName;

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
View File

@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectPurchaseCheckInfoList" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult"> <select id="selectPurchaseCheckInfoList" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult">
select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time,
pci.update_by, pci.update_by,
pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,su.nick_name pci.update_time, pci.remark, pci.company_id ,dict.id purchasingId,dict.name purchasingStatus,tk.code,su.nick_name
purchaserName,tk.task_status taskStatus purchaserName,tk.task_status taskStatus
from purchase_check_info pci from purchase_check_info pci
left join tm_task tk on pci.task_id = tk.task_id left join tm_task tk on pci.task_id = tk.task_id