feat: 小程序部署接口新增
chenhc
3 months ago
parent
f4e323c230
commit
53e1adacfb
@ -0,0 +1,13 @@
|
||||
package com.glxp.api.constant;
|
||||
|
||||
public class FileConstant {
|
||||
|
||||
public static String CERT_FILE_PATH = "";
|
||||
|
||||
public static String INVOICE_FILE_PATH = "";
|
||||
|
||||
public static String PDF_FILE_PATH = "";
|
||||
|
||||
public static String COMMON_FILE_PATH = "register/image2/";
|
||||
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
package com.glxp.api.controller.dev;
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.api.annotation.Log;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.constant.BusinessType;
|
||||
import com.glxp.api.controller.BaseController;
|
||||
import com.glxp.api.entity.dev.DeviceAssetUserEntity;
|
||||
import com.glxp.api.req.inv.FilterInvUserRequest;
|
||||
import com.glxp.api.req.system.DeleteDeviceFileRequest;
|
||||
import com.glxp.api.res.PageSimpleResponse;
|
||||
import com.glxp.api.service.auth.CustomerService;
|
||||
import com.glxp.api.service.dev.DeviceAssetUserService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 设备相关人员
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
public class DeviceAssetUserController extends BaseController {
|
||||
|
||||
@Resource
|
||||
private DeviceAssetUserService deviceAssetUserService;
|
||||
@Resource
|
||||
private CustomerService customerService;
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/inv/device/user/filter")
|
||||
public BaseResponse filterDeviceUser(FilterInvUserRequest filterInvUserRequest) {
|
||||
List<DeviceAssetUserEntity> deviceAssetUserEntityList
|
||||
= deviceAssetUserService.filterDeviceUser(filterInvUserRequest);
|
||||
PageInfo<DeviceAssetUserEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(deviceAssetUserEntityList);
|
||||
PageSimpleResponse<DeviceAssetUserEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(deviceAssetUserEntityList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/inv/info/insertDeviceUser")
|
||||
@Log(title = "相关人员", businessType = BusinessType.INSERT)
|
||||
public BaseResponse insertDeviceUser(@RequestBody DeviceAssetUserEntity deviceAssetUserEntity) {
|
||||
String userId = customerService.getUserId()+ "";
|
||||
Date now = new Date();
|
||||
deviceAssetUserEntity.setCreateTime(now);
|
||||
deviceAssetUserEntity.setUpdateTime(now);
|
||||
deviceAssetUserEntity.setCreateUser(userId);
|
||||
deviceAssetUserEntity.setUpdateUser(userId);
|
||||
deviceAssetUserEntity.setId(IdUtil.getSnowflakeNextId());
|
||||
boolean b = deviceAssetUserService.insertDeviceUser(deviceAssetUserEntity);
|
||||
return ResultVOUtils.success("成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/inv/info/deleteDeviceUser")
|
||||
public BaseResponse deleteDeviceUser(@RequestBody DeleteDeviceFileRequest deleteDeviceFileRequest) {
|
||||
boolean b = deviceAssetUserService.deleteById(deleteDeviceFileRequest.getId());
|
||||
return ResultVOUtils.success("成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/inv/info/updateDeviceUser")
|
||||
@Log(title = "相关人员", businessType = BusinessType.UPDATE)
|
||||
public BaseResponse updateDeviceUser(@RequestBody DeviceAssetUserEntity deviceAssetUserEntity) {
|
||||
String userId = customerService.getUserId()+ "";
|
||||
Date now = new Date();
|
||||
deviceAssetUserEntity.setUpdateTime(now);
|
||||
deviceAssetUserEntity.setUpdateUser(userId);
|
||||
boolean b = deviceAssetUserService.updateDeviceUser(deviceAssetUserEntity);
|
||||
if (b){
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}else {
|
||||
return ResultVOUtils.error("修改失败！");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,89 @@
|
||||
package com.glxp.api.controller.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.annotation.RepeatSubmit;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.entity.purchase.PurContractDetailEntity;
|
||||
import com.glxp.api.entity.purchase.PurContractEntity;
|
||||
import com.glxp.api.entity.purchase.PurPlanEntity;
|
||||
import com.glxp.api.req.purchase.PostPurContractRequest;
|
||||
import com.glxp.api.req.purchase.PurContractDetailRequest;
|
||||
import com.glxp.api.req.purchase.PurContractRequest;
|
||||
import com.glxp.api.res.PageSimpleResponse;
|
||||
import com.glxp.api.res.purchase.PurContractEntityResponse;
|
||||
import com.glxp.api.service.auth.CustomerService;
|
||||
import com.glxp.api.service.purchase.impl.PurContractDetailService;
|
||||
import com.glxp.api.service.purchase.impl.PurContractService;
|
||||
import com.glxp.api.service.system.SystemParamConfigService;
|
||||
import com.glxp.api.util.GennerOrderUtils;
|
||||
import com.glxp.api.util.OrderNoTypeBean;
|
||||
import jodd.util.StringUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
public class PurContractController {
|
||||
|
||||
@Resource
|
||||
PurContractService purContractService;
|
||||
@Resource
|
||||
PurContractDetailService purContractDetailService;
|
||||
@Resource
|
||||
private GennerOrderUtils gennerOrderUtils;
|
||||
@Resource
|
||||
CustomerService customerService;
|
||||
@Resource
|
||||
SystemParamConfigService systemParamConfigService;
|
||||
|
||||
final String type = "cght";
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询采购合同列表
|
||||
*/
|
||||
@GetMapping("/purchase/contract/list")
|
||||
public BaseResponse list(PurContractRequest purContractRequest) {
|
||||
//
|
||||
// Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
|
||||
// purContractRequest.setSysApprovalFlow(sys_approval_flow);
|
||||
|
||||
List<PurContractEntityResponse> purContractEntityResponses = purContractService.queryPageList(purContractRequest);
|
||||
PageInfo<PurContractEntityResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(purContractEntityResponses);
|
||||
PageSimpleResponse<PurContractEntityResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(purContractEntityResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询采购合同详情列表
|
||||
*
|
||||
* @param purContractDetailRequest
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/purchase/contract/list/detail")
|
||||
public BaseResponse getDetailList(PurContractDetailRequest purContractDetailRequest) {
|
||||
IPage<PurContractDetailEntity> page = purContractDetailService.queryPageList(purContractDetailRequest);
|
||||
PageSimpleResponse<PurContractDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(page.getTotal());
|
||||
pageSimpleResponse.setList(page.getRecords());
|
||||
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package com.glxp.api.dao.dev;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.dev.DeviceAssetCertEntity;
|
||||
import com.glxp.api.req.inv.FilterInvCertRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface DeviceAssetCertMapper extends BaseMapper<DeviceAssetCertEntity> {
|
||||
|
||||
List<DeviceAssetCertEntity> filterCompanyCert(FilterInvCertRequest filterInvCertRequest);
|
||||
|
||||
boolean deleteById(String id);
|
||||
|
||||
|
||||
|
||||
boolean updateDeviceCert(DeviceAssetCertEntity deviceAssetCertEntity);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.glxp.api.dao.dev;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.dev.DeviceAssetUserEntity;
|
||||
import com.glxp.api.req.inv.FilterInvUserRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface DeviceAssetUserMapper extends BaseMapper<DeviceAssetUserEntity> {
|
||||
|
||||
List<DeviceAssetUserEntity> filterCompanyUser(FilterInvUserRequest filterInvUserRequest);
|
||||
|
||||
boolean deleteById(String id);
|
||||
|
||||
boolean updateDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.glxp.api.dao.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.purchase.PurContractDetailEntity;
|
||||
|
||||
public interface PurContractDetailMapper extends BaseMapper<PurContractDetailEntity> {
|
||||
|
||||
// int insert(PurContractDetailEntity purContractDetailEntity);
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package com.glxp.api.dao.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.purchase.PurContractEntity;
|
||||
import com.glxp.api.req.purchase.PurContractRequest;
|
||||
import com.glxp.api.res.purchase.PurContractEntityResponse;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface PurContractMapper extends BaseMapper<PurContractEntity> {
|
||||
@Override
|
||||
int insert(PurContractEntity purContractEntity);
|
||||
|
||||
List<PurContractEntityResponse> selectPage(@Param("purContractRequest") PurContractRequest purContractRequest);
|
||||
}
|
||||
@ -0,0 +1,170 @@
|
||||
package com.glxp.api.entity.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 采购合同表
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "pur_contract")
|
||||
public class PurContractEntity implements Serializable {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同编号
|
||||
*/
|
||||
@TableField(value = "code")
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
@TableField(value = "`name`")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 往来单位/供应商
|
||||
*/
|
||||
@TableField(value = "fromCorp")
|
||||
private String fromCorp;
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
@TableField(value = "contractDate")
|
||||
private Date contractDate;
|
||||
|
||||
/**
|
||||
* 当前仓库
|
||||
*/
|
||||
@TableField(value = "invCode")
|
||||
private String invCode;
|
||||
|
||||
/**
|
||||
* 合同状态
|
||||
*/
|
||||
@TableField(value = "`status`")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 合同类型
|
||||
*/
|
||||
@TableField(value = "`type`")
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 付款方式
|
||||
*/
|
||||
@TableField(value = "payType")
|
||||
private String payType;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
@TableField(value = "startDate")
|
||||
private Date startDate;
|
||||
|
||||
/**
|
||||
* 截止时间
|
||||
*/
|
||||
@TableField(value = "endDate")
|
||||
private Date endDate;
|
||||
|
||||
/**
|
||||
* 合同金额
|
||||
*/
|
||||
@TableField(value = "amount")
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 实付金额
|
||||
*/
|
||||
@TableField(value = "payAmount")
|
||||
private BigDecimal payAmount;
|
||||
|
||||
/**
|
||||
* 付款日期
|
||||
*/
|
||||
@TableField(value = "payDate")
|
||||
private Date payDate;
|
||||
|
||||
/**
|
||||
* 开票日期
|
||||
*/
|
||||
@TableField(value = "invoiceDate")
|
||||
private Date invoiceDate;
|
||||
|
||||
/**
|
||||
* 采购计划ID外键
|
||||
*/
|
||||
@TableField(value = "planOrderIdFk")
|
||||
private String planOrderIdFk;
|
||||
|
||||
/**
|
||||
* 采购订单外键
|
||||
*/
|
||||
@TableField(value = "orderIdFk")
|
||||
private String orderIdFk;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(value = "`createUser`")
|
||||
private String createUser;
|
||||
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@TableField(value = "updateUser")
|
||||
private String updateUser;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(value = "createTime")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 审批表主键
|
||||
*/
|
||||
@TableField(value = "approvalFlowId")
|
||||
private String approvalFlowId;
|
||||
|
||||
/**
|
||||
* 是否生成订单 1.已生成;0.未生成
|
||||
*/
|
||||
@TableField(value = "isGenerateOrder")
|
||||
private Integer isGenerateOrder;
|
||||
|
||||
@TableField(value = "pageType")
|
||||
private Integer pageType;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
package com.glxp.api.req.inv;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.glxp.api.util.page.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 查询部门设备明细接口参数
|
||||
*/
|
||||
@Data
|
||||
public class FilterInvUserRequest extends ListPageRequest {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 设备资产编码
|
||||
*/
|
||||
@TableField(value = "devCodeFk")
|
||||
private String devCodeFk;
|
||||
|
||||
/**
|
||||
* 相关人员名称
|
||||
*/
|
||||
@TableField(value = "userName")
|
||||
private String userName;
|
||||
|
||||
/**
|
||||
* 联系方式1
|
||||
*/
|
||||
@TableField(value = "contact1")
|
||||
private String contact1;
|
||||
|
||||
/**
|
||||
* 联系方式2
|
||||
*/
|
||||
@TableField(value = "contact2")
|
||||
private String contact2;
|
||||
|
||||
/**
|
||||
* 备注说明
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(value = "`createUser`")
|
||||
private String createUser;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(value = "createTime")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@TableField(value = "updateUser")
|
||||
private String updateUser;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package com.glxp.api.req.purchase;
|
||||
|
||||
import com.glxp.api.entity.purchase.PurContractDetailEntity;
|
||||
import com.glxp.api.entity.purchase.PurContractEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class PostPurContractRequest {
|
||||
Integer editStatus;
|
||||
PurContractEntity purContractEntity;
|
||||
List<PurContractDetailEntity> purContractDetailEntities;
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.glxp.api.req.purchase;
|
||||
|
||||
import com.glxp.api.util.page.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PurContractDetailRequest extends ListPageRequest {
|
||||
|
||||
/**
|
||||
* 合同外键
|
||||
*/
|
||||
private String orderIdFk;
|
||||
/**
|
||||
* 合同外键
|
||||
*/
|
||||
private String orderItemIdFk;
|
||||
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package com.glxp.api.req.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.glxp.api.util.page.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PurContractRequest extends ListPageRequest {
|
||||
|
||||
|
||||
/**
|
||||
* 合同编号
|
||||
*/
|
||||
private String code;
|
||||
|
||||
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 合同状态
|
||||
*/
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
private String startDate;
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
private String endDate;
|
||||
|
||||
/**
|
||||
* 是否生成订单 1.已生成;0.未生成
|
||||
*/
|
||||
private Integer isGenerateOrder;
|
||||
|
||||
private Boolean sysApprovalFlow;
|
||||
|
||||
@TableField(value = "pageType")
|
||||
private Integer pageType;
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.glxp.api.req.system;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class DeleteDeviceFileRequest {
|
||||
|
||||
String id;
|
||||
String filePath;
|
||||
String filePath2;
|
||||
}
|
||||
@ -0,0 +1,180 @@
|
||||
package com.glxp.api.res.purchase;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 采购合同表
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class PurContractEntityResponse implements Serializable {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同编号
|
||||
*/
|
||||
@TableField(value = "code")
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
@TableField(value = "`name`")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 往来单位/供应商
|
||||
*/
|
||||
@TableField(value = "fromCorp")
|
||||
private String fromCorp;
|
||||
|
||||
/**
|
||||
* 往来单位/供应商
|
||||
*/
|
||||
private String fromCorpName;
|
||||
private String invCodeName;
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
@TableField(value = "contractDate")
|
||||
private Date contractDate;
|
||||
|
||||
/**
|
||||
* 当前仓库
|
||||
*/
|
||||
@TableField(value = "invCode")
|
||||
private String invCode;
|
||||
|
||||
/**
|
||||
* 合同状态
|
||||
*/
|
||||
@TableField(value = "`status`")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 合同类型
|
||||
*/
|
||||
@TableField(value = "`type`")
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 付款方式
|
||||
*/
|
||||
@TableField(value = "payType")
|
||||
private String payType;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
@TableField(value = "startDate")
|
||||
private Date startDate;
|
||||
|
||||
/**
|
||||
* 截止时间
|
||||
*/
|
||||
@TableField(value = "endDate")
|
||||
private Date endDate;
|
||||
|
||||
/**
|
||||
* 合同金额
|
||||
*/
|
||||
@TableField(value = "amount")
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 实付金额
|
||||
*/
|
||||
@TableField(value = "payAmount")
|
||||
private BigDecimal payAmount;
|
||||
|
||||
/**
|
||||
* 付款日期
|
||||
*/
|
||||
@TableField(value = "payDate")
|
||||
private Date payDate;
|
||||
|
||||
/**
|
||||
* 开票日期
|
||||
*/
|
||||
@TableField(value = "invoiceDate")
|
||||
private Date invoiceDate;
|
||||
|
||||
/**
|
||||
* 采购计划ID外键
|
||||
*/
|
||||
@TableField(value = "planOrderIdFk")
|
||||
private String planOrderIdFk;
|
||||
|
||||
/**
|
||||
* 采购订单外键
|
||||
*/
|
||||
@TableField(value = "orderIdFk")
|
||||
private String orderIdFk;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(value = "`createUser`")
|
||||
private String createUser;
|
||||
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@TableField(value = "updateUser")
|
||||
private String updateUser;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(value = "createTime")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 审批表主键
|
||||
*/
|
||||
@TableField(value = "approvalFlowId")
|
||||
private String approvalFlowId;
|
||||
|
||||
private String nextNodeName;
|
||||
|
||||
private Integer nextApprovalNodeType;
|
||||
/**
|
||||
* 是否生成订单 1.已生成;0.未生成
|
||||
*/
|
||||
@TableField(value = "isGenerateOrder")
|
||||
private Integer isGenerateOrder;
|
||||
|
||||
/**
|
||||
* 合同状态
|
||||
*/
|
||||
@TableField(value = "`flowStatus`")
|
||||
private Integer flowStatus;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
package com.glxp.api.service.dev;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.glxp.api.entity.dev.DeviceAssetCertEntity;
|
||||
import com.glxp.api.req.inv.FilterInvCertRequest;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public interface DeviceAssetCertService extends IService<DeviceAssetCertEntity> {
|
||||
List<DeviceAssetCertEntity> filterDeviceCert(FilterInvCertRequest filterInvCertRequest);
|
||||
|
||||
boolean insertDeviceCert(DeviceAssetCertEntity deviceAssetCertEntity);
|
||||
|
||||
boolean deleteById(String id);
|
||||
|
||||
boolean updateDeviceCert(DeviceAssetCertEntity deviceAssetCertEntity);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package com.glxp.api.service.dev;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.glxp.api.entity.dev.DeviceAssetUserEntity;
|
||||
import com.glxp.api.req.inv.FilterInvUserRequest;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public interface DeviceAssetUserService extends IService<DeviceAssetUserEntity> {
|
||||
|
||||
List<DeviceAssetUserEntity> filterDeviceUser(FilterInvUserRequest filterInvUserRequest);
|
||||
|
||||
boolean insertDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity);
|
||||
|
||||
boolean deleteById(String id);
|
||||
|
||||
boolean updateDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package com.glxp.api.service.dev.impl;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.dev.DeviceAssetCertMapper;
|
||||
import com.glxp.api.entity.dev.DeviceAssetCertEntity;
|
||||
import com.glxp.api.req.inv.FilterInvCertRequest;
|
||||
import com.glxp.api.service.dev.DeviceAssetCertService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public class DeviceAssetCertServiceImpl extends ServiceImpl<DeviceAssetCertMapper, DeviceAssetCertEntity> implements DeviceAssetCertService {
|
||||
@Resource
|
||||
DeviceAssetCertMapper deviceAssetCertMapper;
|
||||
|
||||
|
||||
@Override
|
||||
public List<DeviceAssetCertEntity> filterDeviceCert(FilterInvCertRequest filterInvCertRequest) {
|
||||
if (filterInvCertRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (filterInvCertRequest.getPage() != null) {
|
||||
int offset = (filterInvCertRequest.getPage() - 1) * filterInvCertRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterInvCertRequest.getLimit());
|
||||
}
|
||||
return deviceAssetCertMapper.filterCompanyCert(filterInvCertRequest);
|
||||
}
|
||||
@Override
|
||||
public boolean insertDeviceCert(DeviceAssetCertEntity deviceAssetCertEntity) {
|
||||
return deviceAssetCertMapper.insert(deviceAssetCertEntity) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteById(String id) {
|
||||
return deviceAssetCertMapper.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateDeviceCert(DeviceAssetCertEntity deviceAssetCertEntity) {
|
||||
return deviceAssetCertMapper.updateDeviceCert(deviceAssetCertEntity);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package com.glxp.api.service.dev.impl;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.dev.DeviceAssetUserMapper;
|
||||
import com.glxp.api.entity.dev.DeviceAssetUserEntity;
|
||||
import com.glxp.api.req.inv.FilterInvUserRequest;
|
||||
import com.glxp.api.service.dev.DeviceAssetUserService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public class DeviceAssetUserServiceImpl extends ServiceImpl<DeviceAssetUserMapper, DeviceAssetUserEntity> implements DeviceAssetUserService {
|
||||
@Resource
|
||||
DeviceAssetUserMapper deviceAssetUserMapper;
|
||||
|
||||
|
||||
@Override
|
||||
public List<DeviceAssetUserEntity> filterDeviceUser(FilterInvUserRequest filterInvUserRequest) {
|
||||
if (filterInvUserRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (filterInvUserRequest.getPage() != null) {
|
||||
int offset = (filterInvUserRequest.getPage() - 1) * filterInvUserRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterInvUserRequest.getLimit());
|
||||
}
|
||||
return deviceAssetUserMapper.filterCompanyUser(filterInvUserRequest);
|
||||
}
|
||||
@Override
|
||||
public boolean insertDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity) {
|
||||
return deviceAssetUserMapper.insert(deviceAssetUserEntity) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteById(String id) {
|
||||
return deviceAssetUserMapper.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity) {
|
||||
return deviceAssetUserMapper.updateDeviceUser(deviceAssetUserEntity);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,63 @@
|
||||
package com.glxp.api.service.purchase.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.glxp.api.dao.basic.UdiRlSupDao;
|
||||
import com.glxp.api.dao.purchase.PurContractDetailMapper;
|
||||
import com.glxp.api.entity.purchase.PurContractDetailEntity;
|
||||
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
|
||||
import com.glxp.api.req.purchase.PurContractDetailRequest;
|
||||
import com.glxp.api.res.basic.UdiRlSupResponse;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class PurContractDetailService extends ServiceImpl<PurContractDetailMapper, PurContractDetailEntity> {
|
||||
|
||||
@Resource
|
||||
PurContractDetailMapper purContractDetailMapper;
|
||||
@Resource
|
||||
UdiRlSupDao udiRlSupDao;
|
||||
|
||||
|
||||
public IPage<PurContractDetailEntity> queryPageList(PurContractDetailRequest purContractDetailRequest) {
|
||||
QueryWrapper<PurContractDetailEntity> wrapper = buildPurContractDetailQueryWrapper(purContractDetailRequest);
|
||||
IPage<PurContractDetailEntity> page = new Page<>(purContractDetailRequest.getPage(), purContractDetailRequest.getLimit());
|
||||
return purContractDetailMapper.selectPage(page, wrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构造查询条件
|
||||
*
|
||||
* @param purContractDetailRequest
|
||||
* @return
|
||||
*/
|
||||
private QueryWrapper<PurContractDetailEntity> buildPurContractDetailQueryWrapper(PurContractDetailRequest purContractDetailRequest) {
|
||||
QueryWrapper<PurContractDetailEntity> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq(StrUtil.isNotBlank(purContractDetailRequest.getOrderIdFk()), "orderIdFk", purContractDetailRequest.getOrderIdFk())
|
||||
.orderByDesc("id");
|
||||
return wrapper;
|
||||
}
|
||||
|
||||
public int deleteByOrderId(Long id) {
|
||||
UpdateWrapper<PurContractDetailEntity> uw = new UpdateWrapper<>();
|
||||
uw.eq("orderIdFk",id);
|
||||
return purContractDetailMapper.delete(uw);
|
||||
}
|
||||
|
||||
public int deleteByIds(List<Long> asList) {
|
||||
UpdateWrapper<PurContractDetailEntity> uw = new UpdateWrapper<>();
|
||||
uw.in("id",asList);
|
||||
return purContractDetailMapper.delete(uw);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package com.glxp.api.service.purchase.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.purchase.PurContractDetailMapper;
|
||||
import com.glxp.api.dao.purchase.PurContractMapper;
|
||||
import com.glxp.api.dao.purchase.PurPlanDao;
|
||||
import com.glxp.api.entity.purchase.PurContractDetailEntity;
|
||||
import com.glxp.api.entity.purchase.PurContractEntity;
|
||||
import com.glxp.api.entity.purchase.PurPlanEntity;
|
||||
import com.glxp.api.req.purchase.PurContractRequest;
|
||||
import com.glxp.api.req.purchase.PurPlanDetailRequest;
|
||||
import com.glxp.api.res.purchase.PurContractEntityResponse;
|
||||
import com.glxp.api.res.purchase.PurOrderDetailResponse;
|
||||
import com.glxp.api.service.auth.CustomerService;
|
||||
import com.glxp.api.service.purchase.PurPlanDetailService;
|
||||
import com.glxp.api.util.GennerOrderUtils;
|
||||
import com.glxp.api.util.OrderNoTypeBean;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class PurContractService extends ServiceImpl<PurContractMapper, PurContractEntity> {
|
||||
|
||||
@Resource
|
||||
PurContractMapper purContractMapper;
|
||||
|
||||
public List<PurContractEntityResponse> queryPageList(PurContractRequest purContractRequest) {
|
||||
if (purContractRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (purContractRequest.getPage() != null) {
|
||||
int offset = (purContractRequest.getPage() - 1) * purContractRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, purContractRequest.getLimit());
|
||||
}
|
||||
List<PurContractEntityResponse> data = purContractMapper.selectPage(purContractRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,81 @@
|
||||
<?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.glxp.api.dao.dev.DeviceAssetCertMapper">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.dev.DeviceAssetCertEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table device_asset_cert-->
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="devCodeFk" jdbcType="VARCHAR" property="devCodeFk" />
|
||||
<result column="name" jdbcType="VARCHAR" property="name" />
|
||||
<result column="code" jdbcType="VARCHAR" property="code" />
|
||||
<result column="filePath" jdbcType="LONGVARCHAR" property="filePath" />
|
||||
<result column="vailDate" jdbcType="TIMESTAMP" property="vailDate" />
|
||||
<result column="expireDate" jdbcType="TIMESTAMP" property="expireDate" />
|
||||
<result column="status" jdbcType="TINYINT" property="status" />
|
||||
<result column="type" jdbcType="TINYINT" property="type" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
|
||||
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
|
||||
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, devCodeFk, `name`, code, filePath, vailDate, expireDate, `status`, `type`, remark,
|
||||
`createUser`, createTime, updateUser, updateTime
|
||||
</sql>
|
||||
|
||||
<select id="filterCompanyCert" parameterType="com.glxp.api.req.inv.FilterInvCertRequest"
|
||||
resultType="com.glxp.api.entity.dev.DeviceAssetCertEntity">
|
||||
select * from device_asset_cert
|
||||
<where>
|
||||
devCodeFk = #{devCodeFk}
|
||||
<!-- <if test="devCodeFk != '' and devCodeFk!=null">-->
|
||||
<!-- and devCodeFk = #{devCodeFk}-->
|
||||
<!-- </if>-->
|
||||
<if test="name != '' and name!=null">
|
||||
and name = #{name}
|
||||
</if>
|
||||
<if test="code != '' and code!=null">
|
||||
and code = #{code}
|
||||
</if>
|
||||
<if test="status != '' and status!=null">
|
||||
and status = #{status}
|
||||
</if>
|
||||
<if test="type != '' and type!=null">
|
||||
and `type` = #{type}
|
||||
</if>
|
||||
|
||||
|
||||
</where>
|
||||
ORDER BY id DESC
|
||||
</select>
|
||||
|
||||
<delete id="deleteById" parameterType="Map">
|
||||
DELETE
|
||||
FROM device_asset_cert
|
||||
WHERE id = #{id}
|
||||
</delete>
|
||||
|
||||
<update id="updateDeviceCert" parameterType="com.glxp.api.entity.dev.DeviceAssetCertEntity">
|
||||
UPDATE device_asset_cert
|
||||
<trim prefix="set" suffixOverrides=",">
|
||||
<if test="name != null">name=#{name},</if>
|
||||
<if test="devCodeFk != null">devCodeFk=#{devCodeFk},</if>
|
||||
<if test="filePath != null">filePath=#{filePath},</if>
|
||||
<if test="remark != null">remark=#{remark},</if>
|
||||
vailDate=#{vailDate},
|
||||
expireDate=#{expireDate},
|
||||
<if test="type != null">`type`=#{type},</if>
|
||||
<if test="code != null">`code`=#{code},</if>
|
||||
<if test="status != null">`status`=#{status},</if>
|
||||
<if test="updateUser != null">`updateUser`=#{updateUser},</if>
|
||||
<if test="updateTime != null">`updateTime`=#{updateTime},</if>
|
||||
|
||||
</trim>
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,70 @@
|
||||
<?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.glxp.api.dao.dev.DeviceAssetUserMapper">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.dev.DeviceAssetUserEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table device_asset_user-->
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="devCodeFk" jdbcType="VARCHAR" property="devCodeFk" />
|
||||
<result column="userName" jdbcType="VARCHAR" property="userName" />
|
||||
<result column="contact1" jdbcType="VARCHAR" property="contact1" />
|
||||
<result column="contact2" jdbcType="VARCHAR" property="contact2" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
|
||||
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
|
||||
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, devCodeFk, userName, contact1, contact2, remark, `createUser`, createTime, updateUser,
|
||||
updateTime
|
||||
</sql>
|
||||
|
||||
|
||||
<select id="filterCompanyUser" parameterType="com.glxp.api.req.inv.FilterInvUserRequest"
|
||||
resultType="com.glxp.api.entity.dev.DeviceAssetUserEntity">
|
||||
select * from device_asset_user
|
||||
<where>
|
||||
devCodeFk = #{devCodeFk}
|
||||
<!-- <if test="devCodeFk != '' and devCodeFk!=null">-->
|
||||
<!-- and devCodeFk = #{devCodeFk}-->
|
||||
<!-- </if>-->
|
||||
<if test="userName != '' and userName!=null">
|
||||
and userName = #{userName}
|
||||
</if>
|
||||
<if test="contact1 != '' and contact1!=null">
|
||||
and contact1 = #{contact1}
|
||||
</if>
|
||||
<if test="contact2 != '' and contact2!=null">
|
||||
and contact2 = #{contact2}
|
||||
</if>
|
||||
|
||||
</where>
|
||||
ORDER BY id DESC
|
||||
</select>
|
||||
|
||||
<delete id="deleteById" parameterType="Map">
|
||||
DELETE
|
||||
FROM device_asset_user
|
||||
WHERE id = #{id}
|
||||
</delete>
|
||||
|
||||
<update id="updateDeviceUser" parameterType="com.glxp.api.entity.dev.DeviceAssetUserEntity">
|
||||
UPDATE device_asset_user
|
||||
<trim prefix="set" suffixOverrides=",">
|
||||
<if test="userName != null">userName=#{userName},</if>
|
||||
<if test="devCodeFk != null">devCodeFk=#{devCodeFk},</if>
|
||||
<if test="contact1 != null">contact1=#{contact1},</if>
|
||||
<if test="contact2 != null">contact2=#{contact2},</if>
|
||||
<if test="remark != null">`remark`=#{remark},</if>
|
||||
<if test="updateUser != null">`updateUser`=#{updateUser},</if>
|
||||
<if test="updateTime != null">`updateTime`=#{updateTime},</if>
|
||||
|
||||
</trim>
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,88 @@
|
||||
<?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.glxp.api.dao.purchase.PurContractDetailMapper">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurContractDetailEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table pur_contract_detail-->
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="orderIdFk" jdbcType="VARCHAR" property="orderidfk" />
|
||||
<result column="productId" jdbcType="BIGINT" property="productid" />
|
||||
<result column="productUniqueId" jdbcType="VARCHAR" property="productuniqueid" />
|
||||
<result column="nameCode" jdbcType="VARCHAR" property="namecode" />
|
||||
<result column="batchNo" jdbcType="VARCHAR" property="batchno" />
|
||||
<result column="productName" jdbcType="VARCHAR" property="productname" />
|
||||
<result column="productCompany" jdbcType="VARCHAR" property="productcompany" />
|
||||
<result column="produceDate" jdbcType="DATE" property="producedate" />
|
||||
<result column="expireDate" jdbcType="DATE" property="expiredate" />
|
||||
<result column="zczbhhzbapzbh" jdbcType="VARCHAR" property="zczbhhzbapzbh" />
|
||||
<result column="ggxh" jdbcType="VARCHAR" property="ggxh" />
|
||||
<result column="packRatio" jdbcType="VARCHAR" property="packratio" />
|
||||
<result column="supId" jdbcType="BIGINT" property="supid" />
|
||||
<result column="supName" jdbcType="VARCHAR" property="supname" />
|
||||
<result column="count" jdbcType="INTEGER" property="count" />
|
||||
<result column="price" jdbcType="DECIMAL" property="price" />
|
||||
<result column="firstSalesInvNo" jdbcType="VARCHAR" property="firstsalesinvno" />
|
||||
<result column="secSalesInvNo" jdbcType="VARCHAR" property="secsalesinvno" />
|
||||
<result column="secSalesListNo" jdbcType="VARCHAR" property="secsaleslistno" />
|
||||
<result column="invoiceDate" jdbcType="VARCHAR" property="invoicedate" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, orderIdFk, productId, productUniqueId, nameCode, batchNo, productName, productCompany,
|
||||
produceDate, expireDate, zczbhhzbapzbh, ggxh, packRatio, supId, supName, `count`,
|
||||
price, firstSalesInvNo, secSalesInvNo, secSalesListNo, invoiceDate, remark
|
||||
</sql>
|
||||
|
||||
<insert id="insert" keyProperty="id"
|
||||
parameterType="com.glxp.api.entity.purchase.PurContractDetailEntity">
|
||||
replace
|
||||
INTO pur_contract_detail
|
||||
(
|
||||
orderIdFk,
|
||||
productId,
|
||||
productUniqueId,
|
||||
nameCode,
|
||||
batchNo,
|
||||
productName,
|
||||
productCompany,
|
||||
produceDate,
|
||||
expireDate,
|
||||
zczbhhzbapzbh,
|
||||
ggxh,
|
||||
packRatio,
|
||||
supId,
|
||||
supName,
|
||||
`count`,
|
||||
price,
|
||||
firstSalesInvNo,
|
||||
secSalesInvNo,
|
||||
secSalesListNo,
|
||||
invoiceDate,
|
||||
remark
|
||||
)
|
||||
values (
|
||||
#{orderIdFk},
|
||||
#{productId},
|
||||
#{productUniqueId},
|
||||
#{nameCode},
|
||||
#{batchNo},
|
||||
#{productName},
|
||||
#{productCompany},
|
||||
#{produceDate},
|
||||
#{expireDate},
|
||||
#{zczbhhzbapzbh},
|
||||
#{ggxh},
|
||||
#{packRatio},
|
||||
#{supId},
|
||||
#{supName},
|
||||
#{count},
|
||||
#{price},
|
||||
#{firstSalesInvNo},
|
||||
#{secSalesInvNo},
|
||||
#{secSalesListNo},
|
||||
#{invoiceDate},
|
||||
#{remark}
|
||||
)
|
||||
</insert>
|
||||
</mapper>
|
||||
@ -0,0 +1,156 @@
|
||||
<?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.glxp.api.dao.purchase.PurContractMapper">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurContractEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table pur_contract-->
|
||||
<id column="id" jdbcType="INTEGER" property="id" />
|
||||
<result column="code" jdbcType="VARCHAR" property="code" />
|
||||
<result column="name" jdbcType="VARCHAR" property="name" />
|
||||
<result column="fromCorp" jdbcType="VARCHAR" property="fromCorp" />
|
||||
<result column="contractDate" jdbcType="TIMESTAMP" property="contractDate" />
|
||||
<result column="invCode" jdbcType="VARCHAR" property="invCode" />
|
||||
<result column="status" jdbcType="INTEGER" property="status" />
|
||||
<result column="type" jdbcType="INTEGER" property="type" />
|
||||
<result column="payType" jdbcType="INTEGER" property="payType" />
|
||||
<result column="startDate" jdbcType="TIMESTAMP" property="startDate" />
|
||||
<result column="endDate" jdbcType="TIMESTAMP" property="endDate" />
|
||||
<result column="amount" jdbcType="DECIMAL" property="amount" />
|
||||
<result column="payAmount" jdbcType="DECIMAL" property="payAmount" />
|
||||
<result column="payDate" jdbcType="TIMESTAMP" property="payDate" />
|
||||
<result column="invoiceDate" jdbcType="TIMESTAMP" property="invoiceDate" />
|
||||
<result column="planOrderIdFk" jdbcType="VARCHAR" property="planOrderIdFk" />
|
||||
<result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" />
|
||||
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
|
||||
<result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
|
||||
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, code, `name`, fromCorp, contractDate, invCode, `status`, `type`, payType, startDate,
|
||||
endDate, amount, payAmount, payDate, invoiceDate, planOrderIdFk, orderIdFk, `createUser`,
|
||||
updateUser, createTime, updateTime, remark
|
||||
</sql>
|
||||
|
||||
<insert id="insert" keyProperty="id"
|
||||
parameterType="com.glxp.api.entity.purchase.PurPlanEntity" useGeneratedKeys="true">
|
||||
insert
|
||||
INTO pur_contract
|
||||
(
|
||||
code,
|
||||
`name`,
|
||||
fromCorp,
|
||||
contractDate,
|
||||
invCode,
|
||||
`status`,
|
||||
`type`,
|
||||
payType,
|
||||
startDate,
|
||||
endDate,
|
||||
amount,
|
||||
payAmount,
|
||||
payDate,
|
||||
invoiceDate,
|
||||
planOrderIdFk,
|
||||
orderIdFk,
|
||||
`createUser`,
|
||||
updateUser,
|
||||
createTime,
|
||||
updateTime,
|
||||
remark
|
||||
)
|
||||
values (
|
||||
#{code},
|
||||
#{name},
|
||||
#{fromCorp},
|
||||
#{contractDate},
|
||||
#{invCode},
|
||||
#{status},
|
||||
#{type},
|
||||
#{payType},
|
||||
#{startDate},
|
||||
#{endDate},
|
||||
#{amount},
|
||||
#{payAmount},
|
||||
#{payDate},
|
||||
#{invoiceDate},
|
||||
#{planOrderIdFk},
|
||||
#{orderIdFk},
|
||||
#{createUser},
|
||||
#{updateUser},
|
||||
#{createTime},
|
||||
#{updateTime},
|
||||
#{remark}
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
||||
|
||||
<select id="selectPage" parameterType="com.glxp.api.req.purchase.PurContractRequest"
|
||||
resultType="com.glxp.api.res.purchase.PurContractEntityResponse">
|
||||
select
|
||||
pc.id, pc.code, pc.`name`, pc.fromCorp, pc.contractDate, pc.invCode, pc.`type`, pc.payType, pc.startDate,
|
||||
pc.endDate, pc.amount, pc.payAmount, pc.payDate, pc.invoiceDate, pc.planOrderIdFk, pc.orderIdFk, pc.`createUser`,
|
||||
pc.updateUser, pc.createTime, pc.updateTime, pc.remark,pc.approvalFlowId,pc.isGenerateOrder,IFNULL(pc.status,0) as status,
|
||||
saf.status as flowStatus, saf.nextNodeName as nextNodeName , saf.nextApprovalNodeType as nextApprovalNodeType,bc.name as fromCorpName,aw.name AS invCodeName
|
||||
from pur_contract pc
|
||||
left join basic_corp bc on pc.fromCorp = bc.erpId
|
||||
left join auth_warehouse aw on pc.invCode = aw.code
|
||||
left join sys_approval_flow saf ON pc.approvalFlowId = saf.id
|
||||
<where>
|
||||
pc.code is not null
|
||||
<if test="!purContractRequest.sysApprovalFlow">
|
||||
<if test="purContractRequest.status != null and purContractRequest.status != 10 and purContractRequest.status != 11 and purContractRequest.status != 12 ">
|
||||
and pc.status = #{purContractRequest.status}
|
||||
</if>
|
||||
<if test="purContractRequest.status == 10">
|
||||
and (pc.status = 2 )
|
||||
</if>
|
||||
<if test="purContractRequest.status == 11">
|
||||
and (pc.status = 1 or pc.status is null )
|
||||
</if>
|
||||
<if test="purContractRequest.status == 12">
|
||||
and (pc.status = 3 or pc.status = 4)
|
||||
</if>
|
||||
</if>
|
||||
|
||||
<if test="purContractRequest.sysApprovalFlow">
|
||||
<if test="purContractRequest.status != null and purContractRequest.status != 10 and purContractRequest.status != 11 and purContractRequest.status != 12 ">
|
||||
and saf.status = #{purContractRequest.status}
|
||||
</if>
|
||||
<if test="purContractRequest.status == 10">
|
||||
and (saf.status = 2)
|
||||
</if>
|
||||
<if test="purContractRequest.status == 11">
|
||||
and (saf.status = 1 or saf.status is null)
|
||||
</if>
|
||||
<if test="purContractRequest.status == 12">
|
||||
and (saf.status = 3 or saf.status = 4)
|
||||
</if>
|
||||
</if>
|
||||
|
||||
<if test="purContractRequest.code != null and purContractRequest.code != ''" >
|
||||
and pc.code like concat('%',#{purContractRequest.code},'%')
|
||||
</if>
|
||||
<if test="purContractRequest.name != null and purContractRequest.name != ''" >
|
||||
and pc.name like concat('%',#{purContractRequest.name},'%')
|
||||
</if>
|
||||
<if test="purContractRequest.isGenerateOrder != null " >
|
||||
and pc.isGenerateOrder = #{purContractRequest.isGenerateOrder}
|
||||
</if>
|
||||
<if test="purContractRequest.startDate != null and purContractRequest.startDate != ''">
|
||||
AND pc.contractDate <![CDATA[>=]]> #{purContractRequest.startDate}
|
||||
</if>
|
||||
<if test="purContractRequest.endDate != null and purContractRequest.endDate != ''">
|
||||
AND pc.contractDate <![CDATA[<=]]> #{purContractRequest.endDate}
|
||||
</if>
|
||||
<if test="purContractRequest.pageType != null ">
|
||||
AND pc.pageType = #{purContractRequest.pageType}
|
||||
</if>
|
||||
order by id desc
|
||||
</where>
|
||||
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue