Merge remote-tracking branch 'origin/master'

highway
shaoyong 1 year ago
commit eec6231915

@ -31,6 +31,7 @@ public class SysUser extends BaseEntity {
/** 用户账号 */
@Excel(name = "登录名称")
private String userName;
private String userCode;
/** 用户昵称 */
@Excel(name = "用户名称")
@ -99,6 +100,14 @@ public class SysUser extends BaseEntity {
}
public String getUserCode() {
return userCode;
}
public void setUserCode(String userCode) {
this.userCode = userCode;
}
public SysUser(Long userId) {
this.userId = userId;
}

@ -4,6 +4,8 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.quality.domain.QcBomComponent;
import com.op.quality.domain.QcSupplier;
import com.op.system.api.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -106,4 +108,23 @@ public class QcCheckTaskIncomeController extends BaseController {
List<QcBomComponent> list = qcCheckTaskIncomeService.getQcListBom(bomComponent);
return getDataTable(list);
}
/**
*
*/
@GetMapping("/getQcListSupplier")
public TableDataInfo getQcListSupplier(QcSupplier qcSupplier) {
startPage();
List<QcSupplier> list = qcCheckTaskIncomeService.getQcListSupplier(qcSupplier);
return getDataTable(list);
}
/**
*
*/
@GetMapping("/getQcListUser")
public TableDataInfo getQcListUser(SysUser sysUser) {
startPage();
List<SysUser> list = qcCheckTaskIncomeService.getQcListUser(sysUser);
return getDataTable(list);
}
}

@ -0,0 +1,300 @@
package com.op.quality.domain;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* base_supplier
*
* @author Open Platform
* @date 2023-07-18
*/
public class QcSupplier extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键uuid */
private String supplierId;
/** 供应商代码 */
@Excel(name = "供应商代码")
private String supplierCode;
private String supplierName;
/** 中文描述 */
@Excel(name = "中文描述")
private String zhDesc;
/** 英文描述 */
@Excel(name = "英文描述")
private String enDesc;
/** 供应商类型 */
@Excel(name = "供应商类型")
private String supplierType;
/** 账号 */
@Excel(name = "账号")
private String accountNumber;
/** 证照编码 */
@Excel(name = "证照编码")
private String licenceNumber;
/** 经营范围 */
@Excel(name = "经营范围")
private String businessScope;
/** 省 */
@Excel(name = "省")
private String province;
/** 市 */
@Excel(name = "市")
private String city;
/** 区 */
@Excel(name = "区")
private String area;
/** 详细地址 */
@Excel(name = "详细地址")
private String address;
/** 邮编 */
@Excel(name = "邮编")
private String postcode;
/** 联系人 */
@Excel(name = "联系人")
private String contact;
/** 联系人电话 */
@Excel(name = "联系人电话")
private String contactPhone;
/** 联系人职务 */
@Excel(name = "联系人职务")
private String contactPosition;
/** 联系人电子邮件 */
@Excel(name = "联系人电子邮件")
private String contactEmail;
/** 激活标记 */
@Excel(name = "激活标记")
private String activeFlag;
/** 用户自定义1--国家 */
@Excel(name = "用户自定义1--国家")
private String userDefined1;
/** 用户自定义2--税号 */
@Excel(name = "用户自定义2--税号")
private String userDefined2;
/** 用户自定义3 */
@Excel(name = "用户自定义3")
private String userDefined3;
/** 删除标志 */
@Excel(name = "删除标志")
private String delFlag;
public String getSupplierName() {
return supplierName;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
public void setSupplierId(String supplierId) {
this.supplierId = supplierId;
}
public String getSupplierId() {
return supplierId;
}
public void setSupplierCode(String supplierCode) {
this.supplierCode = supplierCode;
}
public String getSupplierCode() {
return supplierCode;
}
public void setZhDesc(String zhDesc) {
this.zhDesc = zhDesc;
}
public String getZhDesc() {
return zhDesc;
}
public void setEnDesc(String enDesc) {
this.enDesc = enDesc;
}
public String getEnDesc() {
return enDesc;
}
public void setSupplierType(String supplierType) {
this.supplierType = supplierType;
}
public String getSupplierType() {
return supplierType;
}
public void setAccountNumber(String accountNumber) {
this.accountNumber = accountNumber;
}
public String getAccountNumber() {
return accountNumber;
}
public void setLicenceNumber(String licenceNumber) {
this.licenceNumber = licenceNumber;
}
public String getLicenceNumber() {
return licenceNumber;
}
public void setBusinessScope(String businessScope) {
this.businessScope = businessScope;
}
public String getBusinessScope() {
return businessScope;
}
public void setProvince(String province) {
this.province = province;
}
public String getProvince() {
return province;
}
public void setCity(String city) {
this.city = city;
}
public String getCity() {
return city;
}
public void setArea(String area) {
this.area = area;
}
public String getArea() {
return area;
}
public void setAddress(String address) {
this.address = address;
}
public String getAddress() {
return address;
}
public void setPostcode(String postcode) {
this.postcode = postcode;
}
public String getPostcode() {
return postcode;
}
public void setContact(String contact) {
this.contact = contact;
}
public String getContact() {
return contact;
}
public void setContactPhone(String contactPhone) {
this.contactPhone = contactPhone;
}
public String getContactPhone() {
return contactPhone;
}
public void setContactPosition(String contactPosition) {
this.contactPosition = contactPosition;
}
public String getContactPosition() {
return contactPosition;
}
public void setContactEmail(String contactEmail) {
this.contactEmail = contactEmail;
}
public String getContactEmail() {
return contactEmail;
}
public void setActiveFlag(String activeFlag) {
this.activeFlag = activeFlag;
}
public String getActiveFlag() {
return activeFlag;
}
public void setUserDefined1(String userDefined1) {
this.userDefined1 = userDefined1;
}
public String getUserDefined1() {
return userDefined1;
}
public void setUserDefined2(String userDefined2) {
this.userDefined2 = userDefined2;
}
public String getUserDefined2() {
return userDefined2;
}
public void setUserDefined3(String userDefined3) {
this.userDefined3 = userDefined3;
}
public String getUserDefined3() {
return userDefined3;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("supplierId", getSupplierId())
.append("supplierCode", getSupplierCode())
.append("zhDesc", getZhDesc())
.append("enDesc", getEnDesc())
.append("supplierType", getSupplierType())
.append("accountNumber", getAccountNumber())
.append("licenceNumber", getLicenceNumber())
.append("businessScope", getBusinessScope())
.append("province", getProvince())
.append("city", getCity())
.append("area", getArea())
.append("address", getAddress())
.append("postcode", getPostcode())
.append("contact", getContact())
.append("contactPhone", getContactPhone())
.append("contactPosition", getContactPosition())
.append("contactEmail", getContactEmail())
.append("activeFlag", getActiveFlag())
.append("userDefined1", getUserDefined1())
.append("userDefined2", getUserDefined2())
.append("userDefined3", getUserDefined3())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("delFlag", getDelFlag())
.toString();
}
}

@ -4,6 +4,8 @@ import java.util.List;
import com.op.quality.domain.QcBomComponent;
import com.op.quality.domain.QcCheckTaskIncome;
import com.op.quality.domain.QcSupplier;
import com.op.system.api.domain.SysUser;
/**
* Mapper
@ -61,4 +63,8 @@ public interface QcCheckTaskIncomeMapper {
public int deleteQcCheckTaskIncomeByRecordIds(String[] recordIds);
public List<QcBomComponent> getQcListBom(QcBomComponent bomComponent);
public List<QcSupplier> getQcListSupplier(QcSupplier qcSupplier);
public List<SysUser> getQcListUser(SysUser sysUser);
}

@ -4,6 +4,8 @@ import java.util.List;
import com.op.quality.domain.QcBomComponent;
import com.op.quality.domain.QcCheckTaskIncome;
import com.op.quality.domain.QcSupplier;
import com.op.system.api.domain.SysUser;
/**
* Service
@ -61,4 +63,8 @@ public interface IQcCheckTaskIncomeService {
public int deleteQcCheckTaskIncomeByRecordId(String recordId);
public List<QcBomComponent> getQcListBom(com.op.quality.domain.QcBomComponent bomComponent);
public List<QcSupplier> getQcListSupplier(QcSupplier qcSupplier);
public List<SysUser> getQcListUser(SysUser sysUser);
}

@ -5,6 +5,8 @@ import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.quality.domain.QcBomComponent;
import com.op.quality.domain.QcSupplier;
import com.op.system.api.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.quality.mapper.QcCheckTaskIncomeMapper;
@ -102,4 +104,16 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
return qcCheckTaskIncomeMapper.getQcListBom(bomComponent);
}
@Override
@DS("#header.poolName")
public List<QcSupplier> getQcListSupplier(QcSupplier qcSupplier) {
return qcCheckTaskIncomeMapper.getQcListSupplier(qcSupplier);
}
//在公共库里不需要切库
@Override
public List<SysUser> getQcListUser(SysUser sysUser) {
return qcCheckTaskIncomeMapper.getQcListUser(sysUser);
}
}

@ -78,8 +78,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="component != null and component != ''"> and product_code like concat('%', #{component}, '%')</if>
<if test="componentName != null and componentName != ''"> and product_desc_zh like concat('%', #{componentName}, '%')</if>
</select>
<select id="getQcListSupplier" resultType="com.op.quality.domain.QcSupplier">
select supplier_code supplierCode,
zh_desc supplierName,
address,
contact_phone contactPhone
from base_supplier where active_flag = '1' and del_flag ='0'
<if test="supplierCode != null and supplierCode != ''"> and supplier_code like concat('%', #{supplierCode}, '%')</if>
<if test="supplierName != null and supplierName != ''"> and zh_desc like concat('%', #{supplierName}, '%')</if>
</select>
<select id="getQcListUser" resultType="com.op.system.api.domain.SysUser">
select user_id userId,
user_name userCode,
nick_name userName,
phonenumber
from sys_user where del_flag = '0' and status = '0'
<if test="userCode != null and userCode != ''"> and user_name like concat('%', #{userCode}, '%')</if>
<if test="userName != null and userName != ''"> and nick_name like concat('%', #{userName}, '%')</if>
</select>
<insert id="insertQcCheckTaskIncome" parameterType="QcCheckTaskIncome">
<insert id="insertQcCheckTaskIncome" parameterType="QcCheckTaskIncome">
insert into qc_check_task_income
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="recordId != null">record_id,</if>

Loading…
Cancel
Save