diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 30394be8..2e756eff 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -189,7 +189,7 @@ public class BackReceiveController extends BaseController { } } - @Log(title = "退料接收-结束任务", businessType = BusinessType.INSERT) + @Log(title = "退料接收-结束任务", businessType = BusinessType.MATERIAL) @PostMapping("endBack") public AjaxResult endBack(@RequestBody BackApplyInfo record) { try { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java index cdc48d37..cc3e6951 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java @@ -128,7 +128,7 @@ public class LeaseOutDetailsController extends BaseController { * * @param record 出库内容 */ - @Log(title = "领料出库", businessType = BusinessType.UPDATE) + @Log(title = "领料出库", businessType = BusinessType.MATERIAL) @PostMapping("/submitOut") public AjaxResult submitOut(@RequestBody LeaseOutDetails record) { return leaseOutDetailsService.submitOut(record); @@ -138,7 +138,7 @@ public class LeaseOutDetailsController extends BaseController { * @param recordList * @return */ - @Log(title = "领料出库", businessType = BusinessType.UPDATE) + @Log(title = "领料出库", businessType = BusinessType.MATERIAL) @PostMapping("/submitOutRfid") public AjaxResult submitOutRfid(@RequestBody List recordList) { if (CollUtil.isEmpty(recordList)){ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index c8fe3eaf..5f03dddc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -265,6 +265,6 @@ public class TmTask implements Serializable { private Date estimateLeaseTime; private Integer souceByRefuse; - private Integer souceBy; + private int souceBy; } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java index 9c6fc3e0..0996f458 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java @@ -103,9 +103,6 @@ public class TmTaskDto implements Serializable { * 创建时间 */ @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @Excel(name = "申请时间", sort = 5) private Date createTime; /** @@ -209,6 +206,9 @@ public class TmTaskDto implements Serializable { private String examineStatus; @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Excel(name = "申请时间", sort = 5) private String createTimes; @ApiModelProperty(value = "更新时间") diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java index 7e0087fb..bbf4927e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java @@ -3,6 +3,8 @@ package com.bonus.sgzb.material.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.bonus.sgzb.common.log.annotation.Log; +import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.material.domain.LeaseApplyInfo; import com.bonus.sgzb.material.domain.MaInputRecord; import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService; @@ -119,6 +121,7 @@ public class PurchaseMacodeInfoController extends BaseController { * 通过/不通过 */ @ApiOperation(value = "新购入库审核") + @Log(title = "新购验收任务", businessType = BusinessType.MATERIAL) @PutMapping("/manageStatus") public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception { return toAjax(purchaseMacodeInfoService.modifyManageStatus(maInputVO)); diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml index 862f1c4f..d9830732 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml @@ -65,11 +65,11 @@ insert into bm_num_logs (model_title, `method`, task, - type_id, num, description, json_result, + type_id, description, json_result, `time`, creator, remark ) values (#{modelTitle,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{task,jdbcType=VARCHAR}, - #{typeId,jdbcType=INTEGER}, #{num,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{jsonResult,jdbcType=VARCHAR}, + #{typeId,jdbcType=INTEGER}, #{description,jdbcType=VARCHAR}, #{jsonResult,jdbcType=VARCHAR}, #{time,jdbcType=TIMESTAMP}, #{creator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR} )