ly 1 rok pred
rodič
commit
960b12eb97

+ 1 - 0
src/main/java/cn/ezhizao/project/business/workOrder/controller/OnceWorkOrderProductionController.java

@@ -172,6 +172,7 @@ public class OnceWorkOrderProductionController extends BaseController {
         } else {
             detail.setStatus(3);
             detail.setRecorderId(SecurityUtils.getUserId());
+            detail.setFinishTime(new Date());
             return toAjax(workOrderRecordService.updateById(detail));
         }
     }

+ 1 - 3
src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrder.java

@@ -239,11 +239,9 @@ public class BizWorkOrder extends BaseEntity {
      */
     @Excel(name = "领取时间", sort = 8, dateFormat = "yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-
+    @TableField(exist = false)
     private Date handlerTime;
-
     @TableField(exist = false)
-
     @Excel(name = "领取人", sort = 7)
     private String handlerName;
     @TableField(exist = false)

+ 7 - 3
src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrderRecord.java

@@ -3,6 +3,7 @@ package cn.ezhizao.project.business.workOrder.domain;
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -60,6 +61,8 @@ public class BizWorkOrderRecord extends BaseEntity
     @ApiModelProperty(value = "记录人/完成人")
     private Long recorderId;
     @ApiModelProperty(value = "办理人")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+
     private Long  handlerId;
     @ApiModelProperty(value = "根节点外键")
     private Long fromId;
@@ -72,6 +75,8 @@ public class BizWorkOrderRecord extends BaseEntity
 
     /** 办理人时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+
     private Date handlerTime;
 
     @TableField(exist = false)
@@ -83,8 +88,7 @@ public class BizWorkOrderRecord extends BaseEntity
     @TableField(exist = false)
     private Date entrustTime;
 
-    /** 更新时间 */
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @TableField(value="update_time",fill= FieldFill.UPDATE)
-    private Date updateTime;
+    private Date finishTime;
 }

+ 2 - 2
src/main/resources/mybatis/business/BizWorkOrderMapper.xml

@@ -52,8 +52,8 @@
                 )
             </if>
             <if test="taskTypeName != null">
-                AND CONCAT( t3.name,"-", t4.name) LIKE concat('%', #{taskTypeName}, '%') OR t1.remark LIKE concat('%',#{taskTypeName}, '%')
-                OR CONCAT(t3.name,"-",t6.alter_type,"-",t4.name) LIKE concat('%', #{taskTypeName}, '%')
+                AND (CONCAT( t3.name,"-", t4.name) LIKE concat('%', #{taskTypeName}, '%') OR t1.remark LIKE concat('%',#{taskTypeName}, '%')
+                OR CONCAT(t3.name,"-",t6.alter_type,"-",t4.name) LIKE concat('%', #{taskTypeName}, '%'))
             </if>
             <if test="handlerName != null ">
                 AND t8.nick_name like concat('%', #{handlerName}, '%')