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

fix conflict

This commit is contained in:
sxu 2024-09-17 17:34:30 +08:00
parent ef69a84117 261980fc01
commit f7bc5de8a2
55 changed files with 324 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
View File

@ -2,8 +2,10 @@ package com.bonus.sgzb.base.api.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
@ -139,6 +141,8 @@ public class BackApplyInfo extends BaseEntity {
@Excel(name = "申请时间",sort = 7)
@ApiModelProperty(value = "退料日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String backTime;
@ -222,7 +226,9 @@ public class BackApplyInfo extends BaseEntity {
/** 机具公司审批时间 */
@ApiModelProperty(value = "机具公司审批时间")
private String directAuditTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date directAuditTime;
/** 机具公司审批备注 */
@ApiModelProperty(value = "机具公司审批备注")

7
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java
View File

@ -1,8 +1,11 @@
package com.bonus.sgzb.base.api.domain;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
@ -106,7 +109,9 @@ public class DirectApplyInfo extends BaseEntity {
/**
* 审核时间
*/
private String auditTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date auditTime;
/**
* 审核备注
*/

23
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
View File

@ -3,10 +3,13 @@ package com.bonus.sgzb.base.api.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
@ -103,7 +106,9 @@ public class MaMachine extends BaseEntity {
* 出厂日期
*/
@ApiModelProperty(value = "出厂日期")
private String outFacTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date outFacTime;
/**
* 出厂编号
*/
@ -124,12 +129,16 @@ public class MaMachine extends BaseEntity {
* 本次检验日期
*/
@ApiModelProperty(value = "本次检验日期")
private String thisCheckTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date thisCheckTime;
/**
* 下次检验日期
*/
@ApiModelProperty(value = "下次检验日期")
private String nextCheckTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date nextCheckTime;
/**
* gps编号
*/
@ -223,7 +232,9 @@ public class MaMachine extends BaseEntity {
/**
* 领料时间
*/
private String leaseTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date leaseTime;
/**
* 退料单位
*/
@ -235,7 +246,9 @@ public class MaMachine extends BaseEntity {
/**
* 退料时间
*/
private String backTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date backTime;
@ApiModelProperty(value = "1：二维码绑定标识 2：rfid绑定标识")
private Integer flag;

12
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MachIneDto.java
View File

@ -1,11 +1,15 @@
package com.bonus.sgzb.base.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.math.BigDecimal;
@ -74,11 +78,15 @@ public class MachIneDto {
/** 本次检修日期 */
@ApiModelProperty(value = "本次检修日期")
private String thisCheckTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date thisCheckTime;
/** 下次检修日期 */
@ApiModelProperty(value = "下次检修日期")
private String nextCheckTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date nextCheckTime;
/** 单价 */
@ApiModelProperty(value = "单价")

11
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementApply.java
View File

@ -1,8 +1,11 @@
package com.bonus.sgzb.base.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
@ -38,7 +41,9 @@ public class SltAgreementApply {
/**
*创建时间
*/
private String createTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
*审核人
*/
@ -46,7 +51,9 @@ public class SltAgreementApply {
/**
*审核时间
*/
private String audiTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date audiTime;
/**
*状态0待审核1审核通过2审核驳回
*/

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

@ -2,9 +2,12 @@ package com.bonus.sgzb.base.api.domain;
import com.alibaba.excel.annotation.ExcelProperty;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
@ -60,13 +63,17 @@ public class SltAgreementInfo {
*/
// @Excel(name = "开始日期",sort = 6)
@ExcelProperty(index = 6, value = "开始日期")
private String startTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
/**
* 退料时间
*/
// @Excel(name = "结算日期",sort = 7)
@ExcelProperty(index = 7, value = "结算日期")
private String endTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
/**
* 0在用1退回
*/

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/BmAgreementInfo.java
View File

@ -1,8 +1,10 @@
package com.bonus.sgzb.app.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@ -33,7 +35,9 @@ public class BmAgreementInfo implements Serializable {
* 签订日期
*/
@ApiModelProperty(value = "签订日期")
private String signTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date signTime;
/**
* 往来单位id

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java
View File

@ -1,6 +1,7 @@
package com.bonus.sgzb.app.domain;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -78,7 +79,9 @@ public class LeaseApplyInfo implements Serializable {
* 公司审批时间
*/
@ApiModelProperty(value = "公司审批时间")
private String companyAuditTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date companyAuditTime;
/**
* 公司审批备注
@ -96,7 +99,9 @@ public class LeaseApplyInfo implements Serializable {
* 分管审批时间
*/
@ApiModelProperty(value = "分管审批时间")
private String deptAuditTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date deptAuditTime;
/**
* 分管审批备注
@ -114,7 +119,9 @@ public class LeaseApplyInfo implements Serializable {
* 机具分公司审批时间
*/
@ApiModelProperty(value = "机具分公司审批时间")
private String directAuditTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date directAuditTime;
@ApiModelProperty(value = "机具分公司审批备注")

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
View File

@ -169,12 +169,20 @@ public class TmTask implements Serializable {
private String backPerson;
@ApiModelProperty(value = "退料人联系电话")
private String phone;
@ApiModelProperty(value = "退料申请时间")
private String backTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date backTime;
@ApiModelProperty(value = "退料审核人 机具分公司审批人")
private String directAuditBy;
@ApiModelProperty(value = "退料审核时间 机具分公司审批时间")
private String directAuditTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date directAuditTime;
@ApiModelProperty(value = "退料审核备注 机具分公司审批备注")
private String directAuditRemark;

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java
View File

@ -1,12 +1,15 @@
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
public class MaPropSet {
public class MaPropSet extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* ID
*/

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeFile.java
View File

@ -39,10 +39,6 @@ public class MaTypeFile extends BaseEntity {
@Excel(name = "上传人")
private String userId;
//上传时间
@Excel(name = "上传时间")
private String time;
//帐号状态（0正常 1停用）
@Excel(name = "帐号状态（0正常 1停用）")
private String status;
@ -99,14 +95,6 @@ public class MaTypeFile extends BaseEntity {
this.userId = userId;
}
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
public String getStatus() {
return status;
}

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisNum.java
View File

@ -1,6 +1,11 @@
package com.bonus.sgzb.base.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
public class MaTypeHisNum {
/**
@ -14,7 +19,9 @@ public class MaTypeHisNum {
/**
* 存入日期
*/
private String time;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date time;
/**
* 帐号状态（0正常 1停用）
*/
@ -43,11 +50,11 @@ public class MaTypeHisNum {
}
public String getTime() {
public Date getTime() {
return time;
}
public void setTime(String time) {
public void setTime(Date time) {
this.time = time;
}

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeHisPrice.java
View File

@ -1,6 +1,11 @@
package com.bonus.sgzb.base.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
public class MaTypeHisPrice {
/**
* 类型ID
@ -13,7 +18,9 @@ public class MaTypeHisPrice {
/**
* 修改日期
*/
private String time;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date time;
/**
* 帐号状态（0正常 1停用）
*/
@ -42,11 +49,11 @@ public class MaTypeHisPrice {
}
public String getTime() {
public Date getTime() {
return time;
}
public void setTime(String time) {
public void setTime(Date time) {
this.time = time;
}

16
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaTypeKeeper.java
View File

@ -2,6 +2,10 @@ package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* 库管员配置ma_type_keeper(MaTypeKeeper)表实体类
@ -22,10 +26,6 @@ public class MaTypeKeeper extends BaseEntity {
@Excel(name = "用户")
private Long userId;
//创建时间
@Excel(name = "创建时间")
private String time;
//数据所属组织
@Excel(name = "数据所属组织")
private String companyId;
@ -46,14 +46,6 @@ public class MaTypeKeeper extends BaseEntity {
this.userId = userId;
}
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
public String getCompanyId() {
return companyId;
}

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
View File

@ -71,6 +71,7 @@ public class MaTypeServiceImpl implements ITypeService {
typeFile.setFileName(maType.getPhotoName());
typeFile.setFileUrl(maType.getPhotoUrl());
typeFile.setFileType("1");
typeFile.setCreateTime(DateUtils.getNowDate());
typeFileMapper.insertMaTypeFile(typeFile);
}
// 文档路径保存
@ -80,23 +81,27 @@ public class MaTypeServiceImpl implements ITypeService {
typeFile1.setFileName(maType.getDocumentName());
typeFile1.setFileUrl(maType.getDocumentUrl());
typeFile1.setFileType("2");
typeFile1.setCreateTime(DateUtils.getNowDate());
typeFileMapper.insertMaTypeFile(typeFile1);
}
// 库管员配置
MaTypeKeeper typeKeeper = new MaTypeKeeper();
typeKeeper.setUserId(maType.getKeeperUserId());
typeKeeper.setTypeId(typeId);
typeKeeper.setCreateTime(DateUtils.getNowDate());
maTypeMapper.insertKeeper(typeKeeper);
// 维修员配置
MaTypeRepair typeRepair = new MaTypeRepair();
typeRepair.setUserId(maType.getRepairUserId());
typeRepair.setTypeId(typeId);
typeRepair.setCreateTime(DateUtils.getNowDate());
maTypeMapper.insertRepair(typeRepair);
// 资产属性配置
MaPropSet propSet = new MaPropSet();
propSet.setTypeId(typeId);
propSet.setPropId(maType.getPropId());
propSet.setCreateTime(DateUtils.getNowDate());
maTypeMapper.insertMaPropSet(propSet);
return i;
}
@ -120,6 +125,8 @@ public class MaTypeServiceImpl implements ITypeService {
typeFile.setFileName(maType.getPhotoName());
typeFile.setFileUrl(maType.getPhotoUrl());
typeFile.setFileType("1");
typeFile.setCreateTime(DateUtils.getNowDate());
typeFile.setUpdateTime(DateUtils.getNowDate());
typeFileMapper.insertMaTypeFile(typeFile);
}
// 文档路径保存
@ -130,6 +137,8 @@ public class MaTypeServiceImpl implements ITypeService {
typeFile1.setFileName(maType.getDocumentName());
typeFile1.setFileUrl(maType.getDocumentUrl());
typeFile1.setFileType("2");
typeFile1.setCreateTime(DateUtils.getNowDate());
typeFile1.setUpdateTime(DateUtils.getNowDate());
typeFileMapper.insertMaTypeFile(typeFile1);
}
// 库管员配置
@ -138,6 +147,8 @@ public class MaTypeServiceImpl implements ITypeService {
MaTypeKeeper typeKeeper = new MaTypeKeeper();
typeKeeper.setUserId(maType.getKeeperUserId());
typeKeeper.setTypeId(typeId);
typeKeeper.setCreateTime(DateUtils.getNowDate());
typeKeeper.setUpdateTime(DateUtils.getNowDate());
maTypeMapper.insertKeeper(typeKeeper);
}
@ -155,6 +166,8 @@ public class MaTypeServiceImpl implements ITypeService {
MaPropSet propSet = new MaPropSet();
propSet.setTypeId(typeId);
propSet.setPropId(maType.getPropId());
propSet.setCreateTime(DateUtils.getNowDate());
propSet.setUpdateTime(DateUtils.getNowDate());
maTypeMapper.insertMaPropSet(propSet);
}
return i;

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
View File

@ -286,7 +286,7 @@ public class BackApplyController extends BaseController {
// -----重庆机具专属-----
backApplyInfo.setStatus("1");
backApplyInfo.setDirectAuditBy(1);
backApplyInfo.setDirectAuditTime(DateUtils.getTime());
backApplyInfo.setDirectAuditTime(DateUtils.getNowDate());
backApplyInfo.setDirectAuditRemark("系统自动审批");
/*设置任务ID*/
backApplyInfo.setTaskId(taskId);

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

@ -7,6 +7,7 @@ import com.bonus.sgzb.base.api.domain.DirectApplyDetails;
import com.bonus.sgzb.base.api.domain.DirectApplyInfo;
import com.bonus.sgzb.base.api.domain.LeaseOutDetails;
import com.bonus.sgzb.base.api.domain.SltAgreementInfo;
import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
@ -127,7 +128,7 @@ public class WorkSiteDirectManageController extends BaseController {
if (directApplyInfo != null) {
directApplyInfo.setStatus("2");
directApplyInfo.setAuditor(SecurityUtils.getLoginUser().getUsername());
directApplyInfo.setAuditTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
directApplyInfo.setAuditTime(DateUtils.getNowDate());
workSiteDirectManageService.refuseDirectApplyInfo(directApplyInfo);
} else {
return AjaxResult.error("参数为空，审核失败");

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java
View File

@ -5,6 +5,7 @@ import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@ -42,7 +43,9 @@ public class AgreementInfo extends BaseEntity {
*/
@Excel(name = "签订日期")
@ApiModelProperty(value = "签订日期")
private String signTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date signTime;
/**
* 往来单位id

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

@ -1,6 +1,8 @@
package com.bonus.sgzb.material.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@ -30,11 +32,15 @@ public class ProjectMonthDetail {
/**
* 开始日期
*/
private String startTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date startTime;
/**
* 结束日期
*/
private String endTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endTime;
/**
* 结算天数
*/

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

@ -2,10 +2,13 @@ package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
@ -36,13 +39,17 @@ public class PurchaseCheckInfo extends BaseEntity
/** 采购日期 */
@ApiModelProperty(value = "采购日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "采购日期")
private String purchaseTime;
private Date purchaseTime;
/** 到货日期 */
@ApiModelProperty(value = "到货日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "到货日期")
private String arrivalTime;
private Date arrivalTime;
/** 采购员名称 */
@ApiModelProperty(value = "采购员名称")
@ -153,21 +160,21 @@ public class PurchaseCheckInfo extends BaseEntity
{
return taskId;
}
public void setPurchaseTime(String purchaseTime)
public void setPurchaseTime(Date purchaseTime)
{
this.purchaseTime = purchaseTime;
}
public String getPurchaseTime()
public Date getPurchaseTime()
{
return purchaseTime;
}
public void setArrivalTime(String arrivalTime)
public void setArrivalTime(Date arrivalTime)
{
this.arrivalTime = arrivalTime;
}
public String getArrivalTime()
public Date getArrivalTime()
{
return arrivalTime;
}

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java
View File

@ -132,8 +132,10 @@ public class PurchasePartDetails extends BaseEntity
private Integer inputNum;
/** 入库时间 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "入库时间")
private String inputTime;
private Date inputTime;
/** 入库人 */
@ApiModelProperty(value = "入库人")
@ -400,11 +402,11 @@ public class PurchasePartDetails extends BaseEntity
this.modelId = modelId;
}
public String getInputTime() {
public Date getInputTime() {
return inputTime;
}
public void setInputTime(String inputTime) {
public void setInputTime(Date inputTime) {
this.inputTime = inputTime;
}

19
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java
View File

@ -2,11 +2,14 @@ package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
@ -32,13 +35,17 @@ public class PurchasePartInfo extends BaseEntity
/** 采购日期 */
@ApiModelProperty(value = "采购日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "采购日期")
private String purchaseTime;
private Date purchaseTime;
/** 到货日期 */
@ApiModelProperty(value = "到货日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "到货日期")
private String arrivalTime;
private Date arrivalTime;
/** 采购员 */
@ApiModelProperty(value = "采购员")
@ -160,21 +167,21 @@ public class PurchasePartInfo extends BaseEntity
{
return taskId;
}
public void setPurchaseTime(String purchaseTime)
public void setPurchaseTime(Date purchaseTime)
{
this.purchaseTime = purchaseTime;
}
public String getPurchaseTime()
public Date getPurchaseTime()
{
return purchaseTime;
}
public void setArrivalTime(String arrivalTime)
public void setArrivalTime(Date arrivalTime)
{
this.arrivalTime = arrivalTime;
}
public String getArrivalTime()
public Date getArrivalTime()
{
return arrivalTime;
}

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapAuditorSet.java
View File

@ -1,8 +1,12 @@
package com.bonus.sgzb.material.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@ApiModel(description="报废审核人员配置")
@Data
@ -55,7 +59,9 @@ public class ScrapAuditorSet {
* 审核时间
*/
@ApiModelProperty(value = "审核时间")
private String auditTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date auditTime;
/**
*驳回原因

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java
View File

@ -259,7 +259,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService {
if ("1".equals(partDetails.getCheckResult())) {
partDetails.setStatus(3);
partDetails.setInputNum(partDetails.getCheckNum());
partDetails.setInputTime(String.valueOf(DateUtils.getNowDate()));
partDetails.setInputTime(DateUtils.getNowDate());
partDetails.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
partDetails.setUpdateTime(DateUtils.getNowDate());
@ -309,6 +309,10 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService {
return res;
}
public static void main(String[] args) {
System.out.println(DateUtils.getNowDate());
}
@Override
public List<PurchasePartInfo> exportList(PurchasePartInfo bean) {
return purchaseAccessoryMapper.exportList(bean);

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
View File

@ -136,6 +136,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
//修改装备状态
for (ScrapApplyDetails scrapApplyDetails: scrapApplyDetailList){
scrapApplyDetails.setAuditTime(new Date());
scrapApplyDetails.setUpdateTime(DateUtils.getNowDate());
scrapApplyDetailsMapper.updateScrapApplyDetails(scrapApplyDetails);
}
//根据任务id查看是否还有未审核的设备
@ -212,7 +213,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
public int scrapTaskReview(ScrapAuditorSet scrapAuditorSet) {
log.info("ScrapApplyDetailsServiceImpl scrapTaskReview begin: {}", scrapAuditorSet);
try {
scrapAuditorSet.setAuditTime(DateUtils.dateTimeNow());
scrapAuditorSet.setAuditTime(new Date());
//修改审核状态
scrapAuditorSetMapper.updateStatus(scrapAuditorSet);
//获取报废任务所有审核人员的审核详情

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

@ -3,6 +3,7 @@ package com.bonus.sgzb.material.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import com.bonus.sgzb.base.api.domain.*;
import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.material.domain.*;
@ -600,7 +601,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId());
directApplyInfos.setStatus("1");
directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername());
directApplyInfos.setAuditTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
directApplyInfos.setAuditTime(DateUtils.getNowDate());
res = refuseDirectApplyInfo(directApplyInfos);
} else {
return res;
@ -616,4 +617,8 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
}
return res;
}
public static void main(String[] args) {
System.out.println(new Date());
}
}

14
sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -542,19 +542,21 @@
)
</insert>
<insert id="insStlInfoTwo">
insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type)
values (#{info.agreementId},#{info.typeId},#{info.maId},#{many},#{info.startTime},#{info.status},#{info.leaseId},#{info.leasePrice},#{info.buyPrice},'0',#{info.companyId},#{info.leaseType});
insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type,create_time)
values (#{info.agreementId},#{info.typeId},#{info.maId},#{many},#{info.startTime},#{info.status},#{info.leaseId},#{info.leasePrice},#{info.buyPrice},'0',#{info.companyId},#{info.leaseType},now());
</insert>
<update id="updateTaskStatus">
update tm_task
set task_status=#{status}
set task_status=#{status},
update_time = NOW()
where task_id = #{taskId}
</update>
<update id="updateMaStatus">
update ma_machine
set ma_status=#{maStatus}
set ma_status=#{maStatus},
update_time = NOW()
where ma_id = #{maId}
</update>
@ -566,6 +568,7 @@
<update id="updateStlInfo">
update slt_agreement_info
set end_time = now(),
update_time = now(),
back_id = #{record.parentId},
status = '1'
where id = #{info.id}
@ -574,13 +577,14 @@
update slt_agreement_info
set num = #{backNum},
end_time = now(),
update_time = now(),
back_id = #{record.parentId},
status = '1'
where id = #{info.id}
</update>
<update id="finishBackCheckDetails">
update back_check_details set is_finished = 1 where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1)
update back_check_details set is_finished = 1, update_time = now() where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1)
</update>
<delete id="deleteCheckDetails">

30
sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml
View File

@ -71,7 +71,7 @@
values (#{code,jdbcType=VARCHAR}, #{taskId,jdbcType=INTEGER}, #{leasePerson,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR},
#{type,jdbcType=VARCHAR}, #{companyAuditBy,jdbcType=INTEGER}, #{companyAuditTime,jdbcType=VARCHAR},
#{companyAuditRemark,jdbcType=VARCHAR}, #{deptAuditBy,jdbcType=INTEGER}, #{deptAuditTime,jdbcType=VARCHAR},
#{deptAuditRemark,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{deptAuditRemark,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, NOW(),
#{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR},
#{companyId,jdbcType=INTEGER}, #{estimateLeaseTime,jdbcType=TIMESTAMP},#{leaseType,jdbcType=VARCHAR},#{costBearingParty,jdbcType=VARCHAR})
</insert>
@ -98,7 +98,7 @@
<if test="companyAuditBy != null">
company_audit_by,
</if>
<if test="companyAuditTime != null and companyAuditTime != ''">
<if test="companyAuditTime != null">
company_audit_time,
</if>
<if test="companyAuditRemark != null and companyAuditRemark != ''">
@ -107,7 +107,7 @@
<if test="deptAuditBy != null">
dept_audit_by,
</if>
<if test="deptAuditTime != null and deptAuditTime != ''">
<if test="deptAuditTime != null">
dept_audit_time,
</if>
<if test="deptAuditRemark != null and deptAuditRemark != ''">
@ -116,9 +116,7 @@
<if test="createBy != null and createBy != ''">
create_by,
</if>
<if test="createTime != null">
create_time,
</if>
create_time,
<if test="updateBy != null and updateBy != ''">
update_by,
</if>
@ -160,8 +158,8 @@
<if test="companyAuditBy != null">
#{companyAuditBy,jdbcType=INTEGER},
</if>
<if test="companyAuditTime != null and companyAuditTime != ''">
#{companyAuditTime,jdbcType=VARCHAR},
<if test="companyAuditTime != null">
#{companyAuditTime},
</if>
<if test="companyAuditRemark != null and companyAuditRemark != ''">
#{companyAuditRemark,jdbcType=VARCHAR},
@ -169,8 +167,8 @@
<if test="deptAuditBy != null">
#{deptAuditBy,jdbcType=INTEGER},
</if>
<if test="deptAuditTime != null and deptAuditTime != ''">
#{deptAuditTime,jdbcType=VARCHAR},
<if test="deptAuditTime != null">
#{deptAuditTime},
</if>
<if test="deptAuditRemark != null and deptAuditRemark != ''">
#{deptAuditRemark,jdbcType=VARCHAR},
@ -178,9 +176,7 @@
<if test="createBy != null and createBy != ''">
#{createBy,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
NOW(),
<if test="updateBy != null and updateBy != ''">
#{updateBy,jdbcType=VARCHAR},
</if>
@ -248,15 +244,13 @@
<if test="updateBy != null and updateBy != ''">
update_by = #{updateBy,jdbcType=VARCHAR},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="remark != null and remark != ''">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
update_time = NOW(),
</set>
where id = #{id,jdbcType=INTEGER}
</update>
@ -277,7 +271,7 @@
create_by = #{createBy,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_by = #{updateBy,jdbcType=VARCHAR},
update_time = #{updateTime,jdbcType=TIMESTAMP},
update_time = NOW(),
remark = #{remark,jdbcType=VARCHAR},
company_id = #{companyId,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
@ -509,7 +503,7 @@
#{item.type,jdbcType=VARCHAR}, #{item.companyAuditBy,jdbcType=INTEGER}, #{item.companyAuditTime,jdbcType=VARCHAR},
#{item.companyAuditRemark,jdbcType=VARCHAR}, #{item.deptAuditBy,jdbcType=INTEGER},
#{item.deptAuditTime,jdbcType=VARCHAR}, #{item.deptAuditRemark,jdbcType=VARCHAR},
#{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR},
#{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR},
#{item.updateTime,jdbcType=TIMESTAMP}, #{item.remark,jdbcType=VARCHAR}, #{item.companyId,jdbcType=INTEGER}
)
</foreach>

10
sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
View File

@ -304,12 +304,14 @@
</update>
<update id="updateTaskStatus">
update tm_task
set task_status = #{status}
set task_status = #{status},
update_time = NOW()
where task_id = #{taskId}
</update>
<update id="updSltInfo">
update slt_agreement_info
set num = #{num}
set num = #{num},
update_time = now()
where id = #{id}
</update>
<update id="updateMaTypeStockNumCt">
@ -383,8 +385,8 @@
</trim>
</insert>
<insert id="insSltInfo">
insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type)
values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},#{record.leaseType});
insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,lease_type,create_time)
values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},#{record.leaseType},now());
</insert>
<select id="leaseOutRecordList" resultType="com.bonus.sgzb.base.api.domain.LeaseOutDetails">

9
sgzb-modules/sgzb-material/src/main/resources/mapper/app/PurchaseInputMapper.xml
View File

@ -80,13 +80,16 @@
</insert>
<update id="updateMaMachine">
update ma_machine set ma_status = #{maStatus} where ma_id = #{maId}
update ma_machine
set ma_status = #{maStatus},
update_time = NOW()
where ma_id = #{maId}
</update>
<update id="updateTypeByTypeId">
update ma_type set num = #{num} where type_id = #{typeId}
</update>
<update id="updateByTaskIdTypeId">
update purchase_check_details set check_num = #{inputNum},status = #{status},input_num=#{inputNum},input_status='1',input_time=NOW() where task_id = #{taskId} and type_id = #{typeId}
update purchase_check_details set check_num = #{inputNum},status = #{status},input_num=#{inputNum},input_status='1',input_time=NOW(),update_time = NOW() where task_id = #{taskId} and type_id = #{typeId}
</update>
<update id="updateMacodeByType">
update purchase_macode_info
@ -120,7 +123,7 @@
and type_id = #{typeId}
</update>
<update id="updatePurchaseCheckDetailsByTaskId">
update purchase_check_details set bind_num = bind_num - 1 , status='5' where task_id = #{taskId} and type_id = #{typeId}
update purchase_check_details set bind_num = bind_num - 1 , status='5', update_time = NOW() where task_id = #{taskId} and type_id = #{typeId}
</update>
<delete id="deleteMaMachineInfoByMaId">

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

@ -55,7 +55,7 @@
</select>
<update id="deleteTaskByPrimaryKey" >
update tm_task set `status` = '0'
update tm_task set `status` = '0',update_time = NOW()
where task_id = #{taskId}
</update>

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

@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteHouseById" parameterType="Long">
update ma_house_info set del_flag = '2' where house_id = #{houseId}
update ma_house_info set del_flag = '2', update_time = NOW() where house_id = #{houseId}
</delete>

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

@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteHouseSetById" parameterType="Long">
update ma_house_set set del_flag = '2' where id = #{id}
update ma_house_set set del_flag = '2', update_time = NOW() where id = #{id}
</delete>

7
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaLabelBindMapper.xml
View File

@ -169,6 +169,7 @@
<if test="binder != null">binder = #{binder},</if>
<if test="labelType != null">label_type = #{labelType},</if>
<if test="companyId != null">company_id = #{companyId},</if>
update_time = NOW()
</trim>
where ma_id = #{maId}
</update>
@ -178,7 +179,7 @@
</delete>
<update id="updateMaLabelBindByMaIds" parameterType="Long">
update ma_label_bind set status = '2' where id = #{id}
update ma_label_bind set status = '2', update_time = NOW() where id = #{id}
</update>
<select id="selectMaMachineMaId" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO">
@ -191,12 +192,12 @@
</select>
<update id="updateMaLabelBindMaIds" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO">
update ma_machine_label set
ma_id = #{maId},is_bind =#{isBind}
ma_id = #{maId},is_bind =#{isBind},update_time = NOW()
where label_id =#{labelId}
</update>
<update id="updateMalableCode" parameterType="com.bonus.sgzb.base.api.domain.MaLabelBind">
update ma_machine_label set
ma_id = #{maId},is_bind =1
ma_id = #{maId},is_bind =1,update_time = NOW()
where label_code =#{labelCode}
</update>
<update id="updateMatypeNum">

19
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
View File

@ -199,12 +199,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="qrCode != null and qrCode != ''">qr_code,</if>
<if test="buyPrice != null and buyPrice != ''">buy_price,</if>
<if test="maVender != null and maVender != ''">ma_vender,</if>
<if test="outFacTime != null and outFacTime != ''">out_fac_time,</if>
<if test="outFacTime != null">out_fac_time,</if>
<if test="outFacCode != null and outFacCode != ''">out_fac_code,</if>
<if test="assetsCode != null and assetsCode != ''">assets_code,</if>
<if test="checkMan != null and checkMan != ''">check_man,</if>
<if test="thisCheckTime != null and thisCheckTime != ''">this_check_time,</if>
<if test="nextCheckTime != null and nextCheckTime != ''">next_check_time,</if>
<if test="thisCheckTime != null">this_check_time,</if>
<if test="nextCheckTime != null">next_check_time,</if>
<if test="gpsCode != null and gpsCode != ''">gps_code,</if>
<if test="rfidCode != null and rfidCode != ''">rfid_code,</if>
<if test="erpCode != null and erpCode != ''">erp_code,</if>
@ -223,12 +223,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="qrCode != null and qrCode != ''">#{qrCode},</if>
<if test="buyPrice != null and buyPrice != ''">#{buyPrice},</if>
<if test="maVender != null and maVender != ''">#{maVender},</if>
<if test="outFacTime != null and outFacTime != ''">#{outFacTime},</if>
<if test="outFacTime != null">#{outFacTime},</if>
<if test="outFacCode != null and outFacCode != ''">#{outFacCode},</if>
<if test="assetsCode != null and assetsCode != ''">#{assetsCode},</if>
<if test="checkMan != null and checkMan != ''">#{checkMan},</if>
<if test="thisCheckTime != null and thisCheckTime != ''">#{thisCheckTime},</if>
<if test="nextCheckTime != null and nextCheckTime != ''">#{nextCheckTime},</if>
<if test="thisCheckTime != null">#{thisCheckTime},</if>
<if test="nextCheckTime != null">#{nextCheckTime},</if>
<if test="gpsCode != null and gpsCode != ''">#{gpsCode},</if>
<if test="rfidCode != null and rfidCode != ''">#{rfidCode},</if>
<if test="erpCode != null and erpCode != ''">#{erpCode},</if>
@ -251,12 +251,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="qrCode != null and qrCode != ''">qr_code = #{qrCode},</if>
<if test="buyPrice != null and buyPrice != ''">buy_price = #{buyPrice},</if>
<if test="maVender != null">ma_vender = #{maVender},</if>
<if test="outFacTime != null and outFacTime != ''">out_fac_time =#{outFacTime},</if>
<if test="outFacTime != null">out_fac_time =#{outFacTime},</if>
<if test="outFacCode != null">out_fac_code = #{outFacCode},</if>
<if test="assetsCode != null">assets_code =#{assetsCode},</if>
<if test="checkMan != null and checkMan != ''">check_man = #{checkMan},</if>
<if test="thisCheckTime != ''">this_check_time = #{thisCheckTime},</if>
<if test="nextCheckTime != ''">next_check_time = #{nextCheckTime},</if>
<if test="thisCheckTime != null">this_check_time = #{thisCheckTime},</if>
<if test="nextCheckTime != null">next_check_time = #{nextCheckTime},</if>
<if test="gpsCode != null and gpsCode != ''">gps_code = #{gpsCode},</if>
<if test="rfidCode != null and rfidCode != ''">rfid_code = #{rfidCode},</if>
<if test="erpCode != null and erpCode != ''">erp_code = #{erpCode},</if>
@ -265,6 +265,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="buyTask != null and buyTask != ''">buy_task = #{buyTask},</if>
<if test="ownHouse != null and ownHouse != ''">own_house = #{ownHouse},</if>
<if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
update_time = sysdate()
</set>
where ma_id = #{maId}
</update>

18
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml
View File

@ -116,7 +116,7 @@
<if test="userId != null and userId != 0">user_id,</if>
<if test="status != null and status != 0">status,</if>
<if test="companyId != null and companyId != ''">company_id,</if>
time
create_time
)values(
<if test="typeId != null and typeId != 0">#{typeId},</if>
<if test="maId != null and maId != ''">#{maId},</if>
@ -225,13 +225,15 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="typeId != null">type_id,</if>
<if test="userId != null">user_id,</if>
<if test="time != null">time,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="companyId != null">company_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="typeId != null">#{typeId},</if>
<if test="userId != null">#{userId},</if>
<if test="time != null">#{time},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="companyId != null">#{companyId},</if>
</trim>
</insert>
@ -241,13 +243,15 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="typeId != null">type_id,</if>
<if test="userId != null">user_id,</if>
<if test="time != null">time,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="companyId != null">company_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="typeId != null">#{typeId},</if>
<if test="userId != null">#{userId},</if>
<if test="time != null">#{time},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="companyId != null">#{companyId},</if>
</trim>
</insert>
@ -301,11 +305,11 @@
</select>
<update id="updateKeeperByTypeId">
update ma_type_keeper set user_id = #{userId} where type_id = #{typeId}
update ma_type_keeper set user_id = #{userId},update_time = now() where type_id = #{typeId}
</update>
<update id="updateRepairByTypeId">
update ma_type_repair set user_id = #{userId} where type_id = #{typeId}
update ma_type_repair set user_id = #{userId},update_time = now() where type_id = #{typeId}
</update>
<update id="updatePropSetByTypeId">

12
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeFileMapper.xml
View File

@ -11,13 +11,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="fileUrl" column="file_url" />
<result property="fileType" column="file_type" />
<result property="userId" column="user_id" />
<result property="time" column="time" />
<result property="status" column="status" />
<result property="companyId" column="company_id" />
</resultMap>
<sql id="selectMaTypeFileVo">
select type_id, ma_id, file_name, file_url, file_type, user_id, time, status, company_id from ma_type_file
select type_id, ma_id, file_name, file_url, file_type, user_id, status, company_id from ma_type_file
</sql>
<select id="selectMaTypeFileList" parameterType="com.bonus.sgzb.base.domain.MaTypeFile" resultMap="MaTypeFileResult">
@ -28,7 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fileUrl != null and fileUrl != ''"> and file_url = #{fileUrl}</if>
<if test="fileType != null and fileType != ''"> and file_type = #{fileType}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="time != null and time != ''"> and time = #{time}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="companyId != null and companyId != ''"> and company_id = #{companyId}</if>
</where>
@ -48,7 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fileUrl != null">file_url,</if>
<if test="fileType != null">file_type,</if>
<if test="userId != null">user_id,</if>
<if test="time != null">time,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="status != null">status,</if>
<if test="companyId != null">company_id,</if>
</trim>
@ -59,7 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fileUrl != null">#{fileUrl},</if>
<if test="fileType != null">#{fileType},</if>
<if test="userId != null">#{userId},</if>
<if test="time != null">#{time},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="status != null">#{status},</if>
<if test="companyId != null">#{companyId},</if>
</trim>
@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
<if test="fileUrl != null">file_url = #{fileUrl},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="time != null">time = #{time},</if>
update_time = now(),
<if test="status != null">status = #{status},</if>
<if test="companyId != null">company_id = #{companyId},</if>
</trim>

6
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisNumMapper.xml
View File

@ -44,12 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="typeHisNumAdd" parameterType="com.bonus.sgzb.base.domain.MaTypeHisNum">
insert into ma_type_his_num (
<if test="storageNum != null and storageNum != '' ">storage_num,</if>
<if test="time != null and time != '' ">time,</if>
<if test="time != null">time,</if>
<if test="status != null and status != '' ">status,</if>
<if test="companyId != null and companyId != ''">company_id</if>
)values(
<if test="storageNum != null and storageNum != ''">#{storageNum},</if>
<if test="time != null and time != ''">#{time},</if>
<if test="time != null">#{time},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="companyId != null and companyId != ''">#{companyId},</if>
)
@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update ma_type_his_num
<set>
<if test="storageNum != null and storageNum != ''">storage_num = #{storageNum},</if>
<if test="time != null and time != ''">time = #{time},</if>
<if test="time != null">time = #{time},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="companyId != null and companyId != ''">company_id = #{companyId},</if>

6
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml
View File

@ -44,12 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="typeHisPriceAdd" parameterType="com.bonus.sgzb.base.domain.MaTypeHisPrice">
insert into ma_type_his_price (
<if test="leasePrice != null and leasePrice != '' ">lease_price,</if>
<if test="time != null and time != '' ">time,</if>
<if test="time != null">time,</if>
<if test="status != null and status != '' ">status,</if>
<if test="companyId != null and companyId != ''">company_id</if>
)values(
<if test="leasePrice != null and leasePrice != ''">#{leasePrice},</if>
<if test="time != null and time != ''">#{time},</if>
<if test="time != null">#{time},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="companyId != null and companyId != ''">#{companyId},</if>
)
@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update ma_type_his_price
<set>
<if test="leasePrice != null and leasePrice != ''">ma_code = #{leasePrice},</if>
<if test="time != null and time != ''">time = #{time},</if>
<if test="time != null">time = #{time},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="companyId != null and companyId != ''">company_id = #{companyId},</if>

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

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.MaintenanceGangMapper">
<insert id="add">
insert into ma_type_repair(type_id, user_id,company_id ,time) values
insert into ma_type_repair(type_id, user_id,company_id ,create_time) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.typeIds},#{item.userId},#{item.companyId},NOW())
</foreach>

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

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.WarehouseKeeperMapper">
<insert id="add">
insert into ma_type_keeper(type_id, user_id,company_id,time) values
insert into ma_type_keeper(type_id, user_id,company_id,create_time) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.typeIds},#{item.userId},#{item.companyId},NOW())
</foreach>

6
sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
View File

@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into bm_agreement_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="agreementCode != null">agreement_code,</if>
<if test="signTime != null and signTime != ''">sign_time,</if>
<if test="signTime != null">sign_time,</if>
<if test="unitId != null">unit_id,</if>
<if test="projectId != null">project_id,</if>
<if test="createBy != null">create_by,</if>
@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="agreementCode != null">#{agreementCode},</if>
<if test="signTime != null and signTime != ''">#{signTime},</if>
<if test="signTime != null">#{signTime},</if>
<if test="unitId != null">#{unitId},</if>
<if test="projectId != null">#{projectId},</if>
<if test="createBy != null">#{createBy},</if>
@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="update">
update bm_agreement_info
<trim prefix="SET" suffixOverrides=",">
<if test="signTime != null and signTime != ''">sign_time = #{signTime},</if>
<if test="signTime != null">sign_time = #{signTime},</if>
<if test="unitId != null">unit_id = #{unitId},</if>
<if test="projectId != null">project_id = #{projectId},</if>
<if test="createBy != null">create_by = #{createBy},</if>

7
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="backPerson != null and backPerson != ''">
back_person,
</if>
<if test="backTime != null and backTime != ''">
<if test="backTime != null">
back_time,
</if>
<if test="phone != null and phone != ''">
@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="directAuditBy != null">
direct_audit_by,
</if>
<if test="directAuditTime != null and directAuditTime != ''">
<if test="directAuditTime != null">
direct_audit_time,
</if>
<if test="directAuditRemark != null">
@ -302,7 +302,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="setModify">
update back_apply_details
set pre_num =#{num}
set pre_num =#{num},
update_time = NOW()
where id = #{detailsId}
</update>

9
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
View File

@ -69,17 +69,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<insert id="insStlInfoTwo">
insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id)
values (#{info.agreementId},#{info.typeId},#{info.maId},#{many},#{info.startTime},#{info.status},#{info.leaseId},#{info.leasePrice},#{info.buyPrice},'0',#{info.companyId});
insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,create_time)
values (#{info.agreementId},#{info.typeId},#{info.maId},#{many},#{info.startTime},#{info.status},#{info.leaseId},#{info.leasePrice},#{info.buyPrice},'0',#{info.companyId},now());
</insert>
<update id="updateMaStatus">
update ma_machine
set ma_status=#{maStatus}
set ma_status=#{maStatus},
update_time = NOW()
where ma_id = #{maId}
</update>
<update id="updateStlInfo">
update slt_agreement_info
set end_time = now(),
update_time = now(),
back_id = #{record.parentId},
status = '1'
where id = #{info.id}
@ -88,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update slt_agreement_info
set num = #{backNum},
end_time = now(),
update_time = now(),
back_id = #{record.parentId},
status = '1'
where id = #{info.id}

10
sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml
View File

@ -8,17 +8,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
INSERT INTO slt_project_month (month,create_time) VALUES (#{month},now())
</insert>
<insert id="insertProMonCosts" useGeneratedKeys="true" keyProperty="id">
insert into project_month_costs(agreement_id,task_id,unit_id,project_id,month,cost_bearing_party)
insert into project_month_costs(agreement_id,task_id,unit_id,project_id,month,cost_bearing_party,create_time)
values
(#{agreementId},#{taskId},#{unitId},#{projectId},#{month},#{costBearingParty})
(#{agreementId},#{taskId},#{unitId},#{projectId},#{month},#{costBearingParty},now())
</insert>
<insert id="insertProjectMonthDetail">
insert into project_month_detail (type_id,ma_id,unit,start_time,end_time,slt_days,slt_costs,month_temporarily_costs,pro_month_cost_id,num,lease_price)
insert into project_month_detail (type_id,ma_id,unit,start_time,end_time,slt_days,slt_costs,month_temporarily_costs,pro_month_cost_id,num,lease_price,create_time)
values
(#{typeId},#{maId},#{unit},#{startTime},#{endTime},#{sltDays},#{sltCosts},#{monthTemporarilyCosts},#{proMonthCostId},#{num},#{leasePrice})
(#{typeId},#{maId},#{unit},#{startTime},#{endTime},#{sltDays},#{sltCosts},#{monthTemporarilyCosts},#{proMonthCostId},#{num},#{leasePrice},now())
</insert>
<update id="updateProMonCosts">
update project_month_costs set costs = #{costs} where id = #{id}
update project_month_costs set costs = #{costs},update_time = now() where id = #{id}
</update>
<select id="getCalcRecords" parameterType="com.bonus.sgzb.material.domain.CalMonthlyBean" resultType="com.bonus.sgzb.material.domain.CalMonthlyBean">

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

@ -117,8 +117,8 @@
<if test="maVender != null and maVender != ''">ma_vender,</if>
<if test="checkMan != null and checkMan != ''">check_man,</if>
<if test="outFacCode != null and outFacCode != ''">out_fac_code,</if>
<if test="thisCheckTime != null and thisCheckTime != ''">this_check_time,</if>
<if test="nextCheckTime != null and nextCheckTime != ''">next_check_time,</if>
<if test="thisCheckTime != null">this_check_time,</if>
<if test="nextCheckTime != null">next_check_time,</if>
create_time
)values(
<if test="typeId != null and typeId != ''">#{typeId},</if>
@ -129,8 +129,8 @@
<if test="maVender != null and maVender != ''">#{maVender},</if>
<if test="checkMan != null and checkMan != ''">#{checkMan},</if>
<if test="outFacCode != null and outFacCode != ''">#{outFacCode},</if>
<if test="thisCheckTime != null and thisCheckTime != ''">#{thisCheckTime},</if>
<if test="nextCheckTime != null and nextCheckTime != ''">#{nextCheckTime},</if>
<if test="thisCheckTime != null">#{thisCheckTime},</if>
<if test="nextCheckTime != null">#{nextCheckTime},</if>
sysdate()
)
</insert>

7
sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml
View File

@ -4,12 +4,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.material.mapper.LeaseRecordMapper">
<insert id="insSltInfo">
insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id)
values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId});
insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id,create_time)
values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId},now());
</insert>
<update id="updSltInfo">
update slt_agreement_info
set num = #{num}
set num = #{num},
update_time = now()
where id = #{id}
</update>
<update id="updateLeaseRecord">

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
View File

@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into purchase_part_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskId != null">task_id,</if>
<if test="purchaseTime != null and purchaseTime != ''">purchase_time,</if>
<if test="purchaseTime != null">purchase_time,</if>
<if test="arrivalTime != null">arrival_time,</if>
<if test="purchaser != null">purchaser,</if>
<if test="createBy != null">create_by,</if>
@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updatePurchasePartInfo" parameterType="com.bonus.sgzb.material.domain.PurchasePartInfo">
update purchase_part_info
<trim prefix="SET" suffixOverrides=",">
<if test="purchaseTime != null and purchaseTime != ''">purchase_time = #{purchaseTime},</if>
<if test="purchaseTime != null">purchase_time = #{purchaseTime},</if>
<if test="arrivalTime != null">arrival_time = #{arrivalTime},</if>
<if test="purchaser != null">purchaser = #{purchaser},</if>
<if test="createBy != null">create_by = #{createBy},</if>

6
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
View File

@ -193,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert>
<update id="updateCheckDetailsByTaskId">
update purchase_check_details set status = 0 where task_id = #{taskId}
update purchase_check_details set status = 0, update_time = NOW() where task_id = #{taskId}
</update>
<select id="selectPurchaseCheckDetailsStatus" resultType="int">
@ -250,13 +250,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<update id="updateByTaskIdTypeId">
update purchase_check_details set status = #{status},input_num=#{inputNum},input_status='1',input_time=NOW() where task_id = #{taskId} and type_id = #{typeId}
update purchase_check_details set status = #{status},input_num=#{inputNum},input_status='1',input_time=NOW(), update_time = NOW() where task_id = #{taskId} and type_id = #{typeId}
</update>
<update id="updateCheckDetails">
update purchase_check_details set status = '0' where task_id = #{taskId}
</update>
<update id="updateBindByTaskIdTypeId">
update purchase_check_details set bind_num = #{bindNum} where task_id = #{taskId} and type_id = #{typeId}
update purchase_check_details set bind_num = #{bindNum}, update_time = NOW() where task_id = #{taskId} and type_id = #{typeId}
</update>
<update id="updatePurchaseCheckDetailsByTaskId">
update purchase_check_details set bind_num = bind_num - 1 , status='5' where task_id = #{taskId} and type_id = #{typeId}

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

@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into purchase_check_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskId != null">task_id,</if>
<if test="purchaseTime != null and purchaseTime != ''">purchase_time,</if>
<if test="purchaseTime != null">purchase_time,</if>
<if test="arrivalTime != null">arrival_time,</if>
<if test="purchaser != null">purchaser,</if>
<if test="createBy != null">create_by,</if>
@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskId != null">#{taskId},</if>
<if test="purchaseTime != null and purchaseTime != ''">#{purchaseTime},</if>
<if test="purchaseTime != null">#{purchaseTime},</if>
<if test="arrivalTime != null">#{arrivalTime},</if>
<if test="purchaser != null">#{purchaser},</if>
<if test="createBy != null">#{createBy},</if>
@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updatePurchaseCheckInfo" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo">
update purchase_check_info
<trim prefix="SET" suffixOverrides=",">
<if test="purchaseTime != null and purchaseTime != ''">purchase_time = #{purchaseTime},</if>
<if test="purchaseTime != null">purchase_time = #{purchaseTime},</if>
<if test="arrivalTime != null">arrival_time = #{arrivalTime},</if>
<if test="purchaser != null">purchaser = #{purchaser},</if>
<if test="createBy != null">create_by = #{createBy},</if>

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
View File

@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into purchase_check_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskId != null">task_id,</if>
<if test="purchaseTime != null and purchaseTime != ''">purchase_time,</if>
<if test="purchaseTime != null">purchase_time,</if>
<if test="arrivalTime != null">arrival_time,</if>
<if test="purchaser != null">purchaser,</if>
<if test="createBy != null">create_by,</if>
@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updatePurchaseCheckInfo" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo">
update purchase_check_info
<trim prefix="SET" suffixOverrides=",">
<if test="purchaseTime != null and purchaseTime != ''">purchase_time = #{purchaseTime},</if>
<if test="purchaseTime != null">purchase_time = #{purchaseTime},</if>
<if test="arrivalTime != null">arrival_time = #{arrivalTime},</if>
<if test="purchaser != null">purchaser = #{purchaser},</if>
<if test="createBy != null">create_by = #{createBy},</if>

12
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
View File

@ -179,12 +179,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="qrCode != null and qrCode != ''">qr_code,</if>
<if test="buyPrice != null and buyPrice != ''">buy_price,</if>
<if test="maVender != null and maVender != ''">ma_vender,</if>
<if test="outFacTime != null and outFacTime != ''">out_fac_time,</if>
<if test="outFacTime != null">out_fac_time,</if>
<if test="outFacCode != null and outFacCode != ''">out_fac_code,</if>
<if test="assetsCode != null and assetsCode != ''">assets_code,</if>
<if test="checkMan != null and checkMan != ''">check_man,</if>
<if test="thisCheckTime != null and thisCheckTime != ''">this_check_time,</if>
<if test="nextCheckTime != null and nextCheckTime != ''">next_check_time,</if>
<if test="thisCheckTime != null">this_check_time,</if>
<if test="nextCheckTime != null">next_check_time,</if>
<if test="gpsCode != null and gpsCode != ''">gps_code,</if>
<if test="rfidCode != null and rfidCode != ''">rfid_code,</if>
<if test="erpCode != null and erpCode != ''">erp_code,</if>
@ -202,12 +202,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="qrCode != null and qrCode != ''">#{qrCode},</if>
<if test="buyPrice != null and buyPrice != ''">#{buyPrice},</if>
<if test="maVender != null and maVender != ''">#{maVender},</if>
<if test="outFacTime != null and outFacTime != ''">#{outFacTime},</if>
<if test="outFacTime != null">#{outFacTime},</if>
<if test="outFacCode != null and outFacCode != ''">#{outFacCode},</if>
<if test="assetsCode != null and assetsCode != ''">#{assetsCode},</if>
<if test="checkMan != null and checkMan != ''">#{checkMan},</if>
<if test="thisCheckTime != null and thisCheckTime != ''">#{thisCheckTime},</if>
<if test="nextCheckTime != null and nextCheckTime != ''">#{nextCheckTime},</if>
<if test="thisCheckTime != null">#{thisCheckTime},</if>
<if test="nextCheckTime != null">#{nextCheckTime},</if>
<if test="gpsCode != null and gpsCode != ''">#{gpsCode},</if>
<if test="rfidCode != null and rfidCode != ''">#{rfidCode},</if>
<if test="erpCode != null and erpCode != ''">#{erpCode},</if>

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

@ -224,7 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where repair_id = #{inputDetails.repairId}
</update>
<update id="updateRecodeStatus">
update repair_apply_record set status = 1 where id = #{id}
update repair_apply_record set status = 1,update_time = now() where id = #{id}
</update>
<delete id="deleteRepairAuditDetailsById" parameterType="Long">

16
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
View File

@ -31,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
values (#{code},#{creator},now(),'0',#{companyId},#{cost});
</insert>
<insert id="insRelation">
insert into slt_agreement_relation (apply_id,agreement_id,add_cost,sub_cost,remark,cost,status,lease_one_cost,lease_three_cost,repair_cost,scrap_cost,lose_cost)
values (#{applyId},#{agreementId},#{addCost},#{subCost},#{remark},#{cost},'0',#{leaseCostOne},#{leaseCostThree},#{repairCost},#{scrapCost},#{loseCost});
insert into slt_agreement_relation (apply_id,agreement_id,add_cost,sub_cost,remark,cost,status,lease_one_cost,lease_three_cost,repair_cost,scrap_cost,lose_cost,create_time)
values (#{applyId},#{agreementId},#{addCost},#{subCost},#{remark},#{cost},'0',#{leaseCostOne},#{leaseCostThree},#{repairCost},#{scrapCost},#{loseCost},now());
</insert>
<insert id="insDetails">
insert into slt_agreement_details
@ -64,12 +64,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateInfoStatus">
update slt_agreement_info
set is_slt = '1',
slt_time = now()
slt_time = now(),
update_time = now(),
where agreement_id = #{agreementId}
</update>
<update id="updateRelation">
update slt_agreement_relation
set status = #{status}
set status = #{status},
update_time = now()
where agreement_id = #{agreementId}
</update>
<update id="updateApply">
@ -77,12 +79,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
set status = #{status},
auditor = #{auditor},
audit_time = now(),
update_time = now(),
remark = #{remark}
where id = #{id}
</update>
<update id="updateMaStatus">
update ma_machine
set ma_status = '103'
set ma_status = '103',
update_time = NOW()
where ma_id = #{maId}
</update>
<update id="updateTrimDay">
@ -113,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update bm_agreement_info set is_slt = 1 where agreement_id = #{agreementId}
</update>
<update id="updateRecodeIsSlt">
update repair_apply_record set is_slt = 1 where id = #{id}
update repair_apply_record set is_slt = 1,update_time = now() where id = #{id}
</update>
<select id="getSltAgreementInfo" resultType="com.bonus.sgzb.material.domain.AgreementInfo">
SELECT bai.agreement_id, bai.agreement_code , contract_code,file_url ,file_name,sign_time,

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

@ -39,7 +39,7 @@
<if test="auditor != null and auditor != ''">
auditor,
</if>
<if test="auditTime != null and auditTime != ''">
<if test="auditTime != null">
audit_time,
</if>
<if test="auditRemark != null and auditRemark != ''">
@ -80,7 +80,7 @@
<if test="auditor != null and auditor != ''">
#{auditor},
</if>
<if test="auditTime != null and auditTime != ''">
<if test="auditTime != null">
#{auditTime},
</if>
<if test="auditRemark != null and auditRemark != ''">
@ -90,8 +90,8 @@
)
</insert>
<insert id="saveDirectApplyDetails" parameterType="com.bonus.sgzb.base.api.domain.DirectApplyDetails">
insert into direct_apply_details(direct_id,type_id,ma_id,direct_num)
values (#{directId},#{typeId},#{maId}, #{directNum})
insert into direct_apply_details(direct_id,type_id,ma_id,direct_num,create_time)
values (#{directId},#{typeId},#{maId}, #{directNum},NOW())
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.material.domain.LeaseApplyInfo" useGeneratedKeys="true">
<!--@mbg.generated-->
@ -323,7 +323,7 @@
)
</insert>
<update id="refuseDirectApplyInfo">
update direct_apply_info set status = #{status},auditor=#{auditor},audit_time=#{auditTime} where id = #{id}
update direct_apply_info set status = #{status},auditor=#{auditor},audit_time=#{auditTime},update_time = now() where id = #{id}
</update>
<update id="updateLeaseApplyDetailsOutNum">
UPDATE