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

datetime

This commit is contained in:
mashuai 2024-09-04 09:13:59 +08:00
parent 7d12bce02e
commit 9e0b96e482
38 changed files with 203 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;
/**
* 审核备注
*/

15
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编号
*/

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

@ -1,7 +1,10 @@
package com.bonus.sgzb.base.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
@ -37,7 +40,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;
/**
*审核人
*/
@ -45,7 +50,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;
}

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

@ -159,12 +159,12 @@ public class MaMachineServiceImpl implements MaMachineService {
if (leaseProject != null){
ma.setLeaseUnit(leaseProject.getUnitName());
ma.setLeasePro(leaseProject.getProjectName());
ma.setLeaseTime(leaseProject.getCreateTime());
ma.setLeaseTime(String.valueOf(leaseProject.getCreateTime()));
}
if (backProject != null){
ma.setBackUnit(backProject.getUnitName());
ma.setBackPro(backProject.getProjectName());
ma.setBackTime(backProject.getCreateTime());
ma.setBackTime(String.valueOf(backProject.getCreateTime()));
}
}else {
throw new ServiceException("二维码对应机具信息无效");

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

@ -73,6 +73,7 @@ public class MaTypeServiceImpl implements ITypeService {
typeFile.setFileName(maType.getPhotoName());
typeFile.setFileUrl(maType.getPhotoUrl());
typeFile.setFileType("1");
typeFile.setCreateTime(DateUtils.getNowDate());
typeFileMapper.insertMaTypeFile(typeFile);
}
// 文档路径保存
@ -82,23 +83,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;
}
@ -122,6 +127,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);
}
// 文档路径保存
@ -132,6 +139,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);
}
// 库管员配置
@ -140,6 +149,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);
}
@ -157,6 +168,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;

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.util.Date;
import java.util.List;
@ -41,7 +42,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

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 BigDecimal 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,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;
/**
@ -31,13 +34,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 = "采购员")
@ -159,21 +166,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;
/**
*驳回原因

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

@ -154,8 +154,8 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService {
projectMonthDetail.setMaId(Integer.valueOf(bean.getMaId()));
}
projectMonthDetail.setUnit(bean.getNuitName());
projectMonthDetail.setStartTime(bean.getStartTime());
projectMonthDetail.setEndTime(bean.getEndTime());
projectMonthDetail.setStartTime(String.valueOf(bean.getStartTime()));
projectMonthDetail.setEndTime(String.valueOf(bean.getEndTime()));
projectMonthDetail.setSltDays(bean.getLeaseDays());
projectMonthDetail.setNum(bean.getNum());
projectMonthDetail.setLeasePrice(bean.getLeasePrice());

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);

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

@ -211,7 +211,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());
}
}

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

@ -549,12 +549,14 @@
<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>

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

@ -304,7 +304,8 @@
</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">

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">

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

@ -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>

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

@ -221,13 +221,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>
@ -237,13 +239,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>

10
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>

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>

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

@ -74,7 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</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">

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}

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

@ -82,7 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</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">