admin/zhyc-sheep
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

派工单2.0

Browse Source
This commit is contained in:
piaobo 2025-12-10 20:27:11 +08:00
parent cc66d1161e
commit 1ecc8fe0af
9 changed files with 104 additions and 443 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zhyc-module/pom.xml
View File

@ -17,11 +17,11 @@
<groupId>zhyc</groupId> <groupId>zhyc</groupId>
<artifactId>zhyc-common</artifactId> <artifactId>zhyc-common</artifactId>
</dependency> </dependency>
<!-- MyBatis-Plus 核心，已含 @TableField -->
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>com.baomidou</groupId>
<artifactId>lombok</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
<version>1.18.38</version> <!-- 使用最新版本 --> <version>3.5.3.2</version> <!-- 用你项目已有的版本 -->
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>

167
zhyc-module/src/main/java/com/zhyc/module/app/domain/AppVersion.java
View File

@ -2,6 +2,9 @@ package com.zhyc.module.app.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.zhyc.common.annotation.Excel; import com.zhyc.common.annotation.Excel;
@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity;
* @author ruoyi * @author ruoyi
* @date 2025-12-09 * @date 2025-12-09
*/ */
@Data
@NoArgsConstructor
@AllArgsConstructor
public class AppVersion extends BaseEntity public class AppVersion extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -73,165 +79,4 @@ public class AppVersion extends BaseEntity
@Excel(name = "是否删除") @Excel(name = "是否删除")
private Integer isDeleted; private Integer isDeleted;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setPlatform(String platform)
{
this.platform = platform;
}
public String getPlatform()
{
return platform;
}
public void setVersionCode(Long versionCode)
{
this.versionCode = versionCode;
}
public Long getVersionCode()
{
return versionCode;
}
public void setVersionName(String versionName)
{
this.versionName = versionName;
}
public String getVersionName()
{
return versionName;
}
public void setIsForceUpdate(Integer isForceUpdate)
{
this.isForceUpdate = isForceUpdate;
}
public Integer getIsForceUpdate()
{
return isForceUpdate;
}
public void setIsLatest(Integer isLatest)
{
this.isLatest = isLatest;
}
public Integer getIsLatest()
{
return isLatest;
}
public void setMinVersionCode(Long minVersionCode)
{
this.minVersionCode = minVersionCode;
}
public Long getMinVersionCode()
{
return minVersionCode;
}
public void setDownloadUrl(String downloadUrl)
{
this.downloadUrl = downloadUrl;
}
public String getDownloadUrl()
{
return downloadUrl;
}
public void setUpdateTitle(String updateTitle)
{
this.updateTitle = updateTitle;
}
public String getUpdateTitle()
{
return updateTitle;
}
public void setUpdateContent(String updateContent)
{
this.updateContent = updateContent;
}
public String getUpdateContent()
{
return updateContent;
}
public void setFileSize(Long fileSize)
{
this.fileSize = fileSize;
}
public Long getFileSize()
{
return fileSize;
}
public void setMd5Hash(String md5Hash)
{
this.md5Hash = md5Hash;
}
public String getMd5Hash()
{
return md5Hash;
}
public void setPublishTime(Date publishTime)
{
this.publishTime = publishTime;
}
public Date getPublishTime()
{
return publishTime;
}
public void setIsDeleted(Integer isDeleted)
{
this.isDeleted = isDeleted;
}
public Integer getIsDeleted()
{
return isDeleted;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("platform", getPlatform())
.append("versionCode", getVersionCode())
.append("versionName", getVersionName())
.append("isForceUpdate", getIsForceUpdate())
.append("isLatest", getIsLatest())
.append("minVersionCode", getMinVersionCode())
.append("downloadUrl", getDownloadUrl())
.append("updateTitle", getUpdateTitle())
.append("updateContent", getUpdateContent())
.append("fileSize", getFileSize())
.append("md5Hash", getMd5Hash())
.append("publishTime", getPublishTime())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("isDeleted", getIsDeleted())
.toString();
}
} }

2
zhyc-module/src/main/java/com/zhyc/module/app/mapper/AppVersionMapper.java
View File

@ -2,6 +2,7 @@ package com.zhyc.module.app.mapper;
import java.util.List; import java.util.List;
import com.zhyc.module.app.domain.AppVersion; import com.zhyc.module.app.domain.AppVersion;
import org.apache.ibatis.annotations.Mapper;
/** /**
* 应用版本信息Mapper接口 * 应用版本信息Mapper接口
@ -9,6 +10,7 @@ import com.zhyc.module.app.domain.AppVersion;
* @author ruoyi * @author ruoyi
* @date 2025-12-09 * @date 2025-12-09
*/ */
@Mapper
public interface AppVersionMapper public interface AppVersionMapper
{ {
/** /**

13
zhyc-module/src/main/java/com/zhyc/module/work/domain/LocationJson.java Normal file
View File

@ -0,0 +1,13 @@
package com.zhyc.module.work.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
class LocationJson {
private Long id;
private String sheepfoldName;
}

13
zhyc-module/src/main/java/com/zhyc/module/work/domain/SheepJson.java Normal file
View File

@ -0,0 +1,13 @@
package com.zhyc.module.work.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
class SheepJson {
private Long id;
private String sheepNo;
}

290
zhyc-module/src/main/java/com/zhyc/module/work/domain/WorkOrder.java
View File

@ -1,7 +1,15 @@
package com.zhyc.module.work.domain; package com.zhyc.module.work.domain;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.zhyc.common.annotation.Excel; import com.zhyc.common.annotation.Excel;
@ -13,6 +21,9 @@ import com.zhyc.common.core.domain.BaseEntity;
* @author piaobo * @author piaobo
* @date 2025-12-07 * @date 2025-12-07
*/ */
@Data
@NoArgsConstructor
@AllArgsConstructor
public class WorkOrder extends BaseEntity public class WorkOrder extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -45,9 +56,13 @@ public class WorkOrder extends BaseEntity
private String department; private String department;
/** 执行人ID（多人用英文逗号），必填 */ /** 执行人ID（多人用英文逗号），必填 */
@Excel(name = "执行人ID", readConverterExp = "多=人用英文逗号") @Excel(name = "执行人ID")
private String executorIds; private String executorIds;
// 执行人
@Excel(name = "执行人")
private String executor;
/** 计划执行日期，必填 */ /** 计划执行日期，必填 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "计划执行日期，必填", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "计划执行日期，必填", width = 30, dateFormat = "yyyy-MM-dd")
@ -59,11 +74,13 @@ public class WorkOrder extends BaseEntity
/** 涉及羊只范围 */ /** 涉及羊只范围 */
@Excel(name = "涉及羊只范围") @Excel(name = "涉及羊只范围")
private String sheepScope; @TableField(typeHandler = JacksonTypeHandler.class)
private List<SheepJson> sheepScope;
/** 执行地点/栏舍 */ /** 执行地点/栏舍 */
@Excel(name = "执行地点/栏舍") @Excel(name = "执行地点/栏舍")
private String location; @TableField(typeHandler = JacksonTypeHandler.class)
private List<LocationJson> location;
/** 需领物料 */ /** 需领物料 */
@Excel(name = "需领物料") @Excel(name = "需领物料")
@ -84,6 +101,9 @@ public class WorkOrder extends BaseEntity
/** 派工人用户 */ /** 派工人用户 */
@Excel(name = "派工人用户") @Excel(name = "派工人用户")
private Long issuerId; private Long issuerId;
// 派工人
@Excel(name = "派工人")
private String issuer;
/** 派工时间 */ /** 派工时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@ -93,6 +113,9 @@ public class WorkOrder extends BaseEntity
/** 接工人用户 */ /** 接工人用户 */
@Excel(name = "接工人用户") @Excel(name = "接工人用户")
private Long receiverId; private Long receiverId;
// 接工人
@Excel(name = "接工人")
private String receiver;
/** 接工时间 */ /** 接工时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@ -111,265 +134,4 @@ public class WorkOrder extends BaseEntity
/** 逻辑删除：0正常 1已删除，必填 */ /** 逻辑删除：0正常 1已删除，必填 */
private Integer deleted; private Integer deleted;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setOrderNo(String orderNo)
{
this.orderNo = orderNo;
}
public String getOrderNo()
{
return orderNo;
}
public void setPlanId(Long planId)
{
this.planId = planId;
}
public Long getPlanId()
{
return planId;
}
public void setBizType(Integer bizType)
{
this.bizType = bizType;
}
public Integer getBizType()
{
return bizType;
}
public void setTitle(String title)
{
this.title = title;
}
public String getTitle()
{
return title;
}
public void setContent(String content)
{
this.content = content;
}
public String getContent()
{
return content;
}
public void setDepartment(String department)
{
this.department = department;
}
public String getDepartment()
{
return department;
}
public void setExecutorIds(String executorIds)
{
this.executorIds = executorIds;
}
public String getExecutorIds()
{
return executorIds;
}
public void setExecuteDate(Date executeDate)
{
this.executeDate = executeDate;
}
public Date getExecuteDate()
{
return executeDate;
}
public void setExecuteTime(String executeTime)
{
this.executeTime = executeTime;
}
public String getExecuteTime()
{
return executeTime;
}
public void setSheepScope(String sheepScope)
{
this.sheepScope = sheepScope;
}
public String getSheepScope()
{
return sheepScope;
}
public void setLocation(String location)
{
this.location = location;
}
public String getLocation()
{
return location;
}
public void setMaterialList(String materialList)
{
this.materialList = materialList;
}
public String getMaterialList()
{
return materialList;
}
public void setToolList(String toolList)
{
this.toolList = toolList;
}
public String getToolList()
{
return toolList;
}
public void setStatus(Integer status)
{
this.status = status;
}
public Integer getStatus()
{
return status;
}
public void setPriority(Integer priority)
{
this.priority = priority;
}
public Integer getPriority()
{
return priority;
}
public void setIssuerId(Long issuerId)
{
this.issuerId = issuerId;
}
public Long getIssuerId()
{
return issuerId;
}
public void setIssueTime(Date issueTime)
{
this.issueTime = issueTime;
}
public Date getIssueTime()
{
return issueTime;
}
public void setReceiverId(Long receiverId)
{
this.receiverId = receiverId;
}
public Long getReceiverId()
{
return receiverId;
}
public void setReceiveTime(Date receiveTime)
{
this.receiveTime = receiveTime;
}
public Date getReceiveTime()
{
return receiveTime;
}
public void setFinishTime(Date finishTime)
{
this.finishTime = finishTime;
}
public Date getFinishTime()
{
return finishTime;
}
public void setResult(String result)
{
this.result = result;
}
public String getResult()
{
return result;
}
public void setDeleted(Integer deleted)
{
this.deleted = deleted;
}
public Integer getDeleted()
{
return deleted;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("orderNo", getOrderNo())
.append("planId", getPlanId())
.append("bizType", getBizType())
.append("title", getTitle())
.append("content", getContent())
.append("department", getDepartment())
.append("executorIds", getExecutorIds())
.append("executeDate", getExecuteDate())
.append("executeTime", getExecuteTime())
.append("sheepScope", getSheepScope())
.append("location", getLocation())
.append("materialList", getMaterialList())
.append("toolList", getToolList())
.append("status", getStatus())
.append("priority", getPriority())
.append("issuerId", getIssuerId())
.append("issueTime", getIssueTime())
.append("receiverId", getReceiverId())
.append("receiveTime", getReceiveTime())
.append("finishTime", getFinishTime())
.append("result", getResult())
.append("remark", getRemark())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("deleted", getDeleted())
.toString();
}
} }

2
zhyc-module/src/main/java/com/zhyc/module/work/mapper/WorkOrderMapper.java
View File

@ -2,6 +2,7 @@ package com.zhyc.module.work.mapper;
import java.util.List; import java.util.List;
import com.zhyc.module.work.domain.WorkOrder; import com.zhyc.module.work.domain.WorkOrder;
import org.apache.ibatis.annotations.Mapper;
/** /**
* 派工单Mapper接口 * 派工单Mapper接口
@ -9,6 +10,7 @@ import com.zhyc.module.work.domain.WorkOrder;
* @author piaobo * @author piaobo
* @date 2025-12-07 * @date 2025-12-07
*/ */
@Mapper
public interface WorkOrderMapper public interface WorkOrderMapper
{ {
/** /**

12
zhyc-module/src/main/java/com/zhyc/module/work/service/impl/WorkOrderServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.zhyc.module.work.service.impl;
import java.util.List; import java.util.List;
import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.zhyc.module.work.mapper.WorkOrderMapper; import com.zhyc.module.work.mapper.WorkOrderMapper;
@ -41,6 +42,7 @@ public class WorkOrderServiceImpl implements IWorkOrderService
@Override @Override
public List<WorkOrder> selectWorkOrderList(WorkOrder workOrder) public List<WorkOrder> selectWorkOrderList(WorkOrder workOrder)
{ {
String username = SecurityUtils.getLoginUser().getUser().getNickName();
return workOrderMapper.selectWorkOrderList(workOrder); return workOrderMapper.selectWorkOrderList(workOrder);
} }
@ -53,6 +55,10 @@ public class WorkOrderServiceImpl implements IWorkOrderService
@Override @Override
public int insertWorkOrder(WorkOrder workOrder) public int insertWorkOrder(WorkOrder workOrder)
{ {
String username = SecurityUtils.getLoginUser().getUser().getNickName();
Long usrId = SecurityUtils.getLoginUser().getUserId();
workOrder.setIssuer(username);
workOrder.setIssuerId(usrId);
workOrder.setCreateTime(DateUtils.getNowDate()); workOrder.setCreateTime(DateUtils.getNowDate());
return workOrderMapper.insertWorkOrder(workOrder); return workOrderMapper.insertWorkOrder(workOrder);
} }
@ -66,6 +72,12 @@ public class WorkOrderServiceImpl implements IWorkOrderService
@Override @Override
public int updateWorkOrder(WorkOrder workOrder) public int updateWorkOrder(WorkOrder workOrder)
{ {
if (workOrder.getStatus() != null && workOrder.getStatus()>3){
String username = SecurityUtils.getLoginUser().getUser().getNickName();
Long usrId = SecurityUtils.getLoginUser().getUserId();
workOrder.setIssuer(username);
workOrder.setIssuerId(usrId);
}
workOrder.setUpdateTime(DateUtils.getNowDate()); workOrder.setUpdateTime(DateUtils.getNowDate());
return workOrderMapper.updateWorkOrder(workOrder); return workOrderMapper.updateWorkOrder(workOrder);
} }

40
zhyc-module/src/main/resources/mapper/work/WorkOrderMapper.xml
View File

@ -13,17 +13,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="content" column="content" /> <result property="content" column="content" />
<result property="department" column="department" /> <result property="department" column="department" />
<result property="executorIds" column="executor_ids" /> <result property="executorIds" column="executor_ids" />
<result property="executor" column="executor" />
<result property="executeDate" column="execute_date" /> <result property="executeDate" column="execute_date" />
<result property="executeTime" column="execute_time" /> <result property="executeTime" column="execute_time" />
<result property="sheepScope" column="sheep_scope" /> <result property="sheepScope" column="sheep_scope" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
<result property="location" column="location" /> <result property="location" column="location" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
<result property="materialList" column="material_list" /> <result property="materialList" column="material_list" />
<result property="toolList" column="tool_list" /> <result property="toolList" column="tool_list" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="priority" column="priority" /> <result property="priority" column="priority" />
<result property="issuerId" column="issuer_id" /> <result property="issuerId" column="issuer_id" />
<result property="issuer" column="issuer" />
<result property="issueTime" column="issue_time" /> <result property="issueTime" column="issue_time" />
<result property="receiverId" column="receiver_id" /> <result property="receiverId" column="receiver_id" />
<result property="receiver" column="receiver" />
<result property="receiveTime" column="receive_time" /> <result property="receiveTime" column="receive_time" />
<result property="finishTime" column="finish_time" /> <result property="finishTime" column="finish_time" />
<result property="result" column="result" /> <result property="result" column="result" />
@ -34,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectWorkOrderVo"> <sql id="selectWorkOrderVo">
select id, order_no, plan_id, biz_type, title, content, department, executor_ids, execute_date, execute_time, sheep_scope, location, material_list, tool_list, status, priority, issuer_id, issue_time, receiver_id, receive_time, finish_time, result, remark, create_time, update_time, deleted from work_order select id, order_no, plan_id, biz_type, title, content, department, executor_ids,executor, execute_date, execute_time, sheep_scope, location, material_list, tool_list, status, priority, issuer_id, issuer,issue_time, receiver_id, receiver,receive_time, finish_time, result, remark, create_time, update_time, deleted from work_order
</sql> </sql>
<select id="selectWorkOrderList" parameterType="WorkOrder" resultMap="WorkOrderResult"> <select id="selectWorkOrderList" parameterType="WorkOrder" resultMap="WorkOrderResult">
@ -43,11 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="orderNo != null and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if> <if test="orderNo != null and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
<if test="planId != null "> and plan_id = #{planId}</if> <if test="planId != null "> and plan_id = #{planId}</if>
<if test="bizType != null "> and biz_type = #{bizType}</if> <if test="bizType != null "> and biz_type = #{bizType}</if>
<if test="title != null and title != ''"> and title = #{title}</if> <if test="title != null and title != ''"> and title like coucat('%', #{title},'%')</if>
<if test="content != null and content != ''"> and content = #{content}</if> <if test="content != null and content != ''"> and content = #{content}</if>
<if test="department != null and department != ''"> and department = #{department}</if> <if test="department != null and department != ''"> and department = #{department}</if>
<if test="executorIds != null and executorIds != ''"> and executor_ids = #{executorIds}</if> <if test="executor != null and executor != ''"> and executor like coucat('%',#{executor},'%') </if>
<if test="executeDate != null "> and execute_date = #{executeDate}</if> <if test="params.beginPlanDate != null and params.beginPlanDate != '' and params.endPlanDat != null and params.endPlanDate != ''"> and execute_date between #{params.beginPlanDate} and #{params.endPlanDate}</if>
<if test="executeTime != null and executeTime != ''"> and execute_time = #{executeTime}</if> <if test="executeTime != null and executeTime != ''"> and execute_time = #{executeTime}</if>
<if test="sheepScope != null and sheepScope != ''"> and sheep_scope = #{sheepScope}</if> <if test="sheepScope != null and sheepScope != ''"> and sheep_scope = #{sheepScope}</if>
<if test="location != null and location != ''"> and location = #{location}</if> <if test="location != null and location != ''"> and location = #{location}</if>
@ -55,11 +58,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="toolList != null and toolList != ''"> and tool_list = #{toolList}</if> <if test="toolList != null and toolList != ''"> and tool_list = #{toolList}</if>
<if test="status != null "> and status = #{status}</if> <if test="status != null "> and status = #{status}</if>
<if test="priority != null "> and priority = #{priority}</if> <if test="priority != null "> and priority = #{priority}</if>
<if test="issuerId != null "> and issuer_id = #{issuerId}</if> <if test="issuer != null "> and issuer like concat('%',#{issuer},'%') </if>
<if test="issueTime != null "> and issue_time = #{issueTime}</if> <if test="issueTime != null "> and issue_time = #{issueTime}</if>
<if test="receiverId != null "> and receiver_id = #{receiverId}</if> <if test="receiverId != null "> and receiver_id = #{receiverId}</if>
<if test="receiveTime != null "> and receive_time = #{receiveTime}</if> <if test="receiveTime != null "> and receive_time = #{receiveTime}</if>
<if test="finishTime != null "> and finish_time = #{finishTime}</if> <if test="params.beginDatetime != null and params.beginDatetime != '' and params.endFinishDate != null and params.endFinishDate != ''"> and finish_time between #{params.beginFinishDate} and #{params.endFinishDate}</if>
<if test="result != null and result != ''"> and result = #{result}</if> <if test="result != null and result != ''"> and result = #{result}</if>
</where> </where>
</select> </select>
@ -79,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="content != null">content,</if> <if test="content != null">content,</if>
<if test="department != null and department != ''">department,</if> <if test="department != null and department != ''">department,</if>
<if test="executorIds != null and executorIds != ''">executor_ids,</if> <if test="executorIds != null and executorIds != ''">executor_ids,</if>
<if test="executor != null and executor != ''">executor,</if>
<if test="executeDate != null">execute_date,</if> <if test="executeDate != null">execute_date,</if>
<if test="executeTime != null">execute_time,</if> <if test="executeTime != null">execute_time,</if>
<if test="sheepScope != null and sheepScope != ''">sheep_scope,</if> <if test="sheepScope != null and sheepScope != ''">sheep_scope,</if>
@ -88,11 +92,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null">status,</if> <if test="status != null">status,</if>
<if test="priority != null">priority,</if> <if test="priority != null">priority,</if>
<if test="issuerId != null">issuer_id,</if> <if test="issuerId != null">issuer_id,</if>
<if test="issuer != null">issuer,</if>
<if test="issueTime != null">issue_time,</if> <if test="issueTime != null">issue_time,</if>
<if test="receiverId != null">receiver_id,</if> <if test="receiverId != null">receiver_id,</if>
<if test="receiver != null">receiver,</if>
<if test="receiveTime != null">receive_time,</if> <if test="receiveTime != null">receive_time,</if>
<if test="finishTime != null">finish_time,</if> <if test="finishTime != null">finish_time,</if>
<if test="result != null">result,</if> <if test="result != null">`result`,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
@ -106,17 +112,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="content != null">#{content},</if> <if test="content != null">#{content},</if>
<if test="department != null and department != ''">#{department},</if> <if test="department != null and department != ''">#{department},</if>
<if test="executorIds != null and executorIds != ''">#{executorIds},</if> <if test="executorIds != null and executorIds != ''">#{executorIds},</if>
<if test="executor != null and executor != ''">#{executor},</if>
<if test="executeDate != null">#{executeDate},</if> <if test="executeDate != null">#{executeDate},</if>
<if test="executeTime != null">#{executeTime},</if> <if test="executeTime != null">#{executeTime},</if>
<if test="sheepScope != null and sheepScope != ''">#{sheepScope},</if> <if test="sheepScope != null and sheepScope != ''">#{sheepScope,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},</if>
<if test="location != null">#{location},</if> <if test="location != null">#{location,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},</if>
<if test="materialList != null">#{materialList},</if> <if test="materialList != null">#{materialList},</if>
<if test="toolList != null">#{toolList},</if> <if test="toolList != null">#{toolList},</if>
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
<if test="priority != null">#{priority},</if> <if test="priority != null">#{priority},</if>
<if test="issuerId != null">#{issuerId},</if> <if test="issuerId != null">#{issuerId},</if>
<if test="issuer != null">#{issuer},</if>
<if test="issueTime != null">#{issueTime},</if> <if test="issueTime != null">#{issueTime},</if>
<if test="receiverId != null">#{receiverId},</if> <if test="receiverId != null">#{receiverId},</if>
<if test="receiver != null">#{receiver},</if>
<if test="receiveTime != null">#{receiveTime},</if> <if test="receiveTime != null">#{receiveTime},</if>
<if test="finishTime != null">#{finishTime},</if> <if test="finishTime != null">#{finishTime},</if>
<if test="result != null">#{result},</if> <if test="result != null">#{result},</if>
@ -137,20 +146,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="content != null">content = #{content},</if> <if test="content != null">content = #{content},</if>
<if test="department != null and department != ''">department = #{department},</if> <if test="department != null and department != ''">department = #{department},</if>
<if test="executorIds != null and executorIds != ''">executor_ids = #{executorIds},</if> <if test="executorIds != null and executorIds != ''">executor_ids = #{executorIds},</if>
<if test="executor != null and executor != ''">executor = #{executor},</if>
<if test="executeDate != null">execute_date = #{executeDate},</if> <if test="executeDate != null">execute_date = #{executeDate},</if>
<if test="executeTime != null">execute_time = #{executeTime},</if> <if test="executeTime != null">execute_time = #{executeTime},</if>
<if test="sheepScope != null and sheepScope != ''">sheep_scope = #{sheepScope},</if> <if test="sheepScope != null and sheepScope != ''">sheep_scope = #{sheepScope,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},</if>
<if test="location != null">location = #{location},</if> <if test="location != null">location = #{location,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},</if>
<if test="materialList != null">material_list = #{materialList},</if> <if test="materialList != null">material_list = #{materialList},</if>
<if test="toolList != null">tool_list = #{toolList},</if> <if test="toolList != null">tool_list = #{toolList},</if>
<if test="status != null">status = #{status},</if> <if test="status != null">status = #{status},</if>
<if test="priority != null">priority = #{priority},</if> <if test="priority != null">priority = #{priority},</if>
<if test="issuerId != null">issuer_id = #{issuerId},</if> <if test="issuerId != null">issuer_id = #{issuerId},</if>
<if test="issuer != null">issuer = #{issuer},</if>
<if test="issueTime != null">issue_time = #{issueTime},</if> <if test="issueTime != null">issue_time = #{issueTime},</if>
<if test="receiverId != null">receiver_id = #{receiverId},</if> <if test="receiverId != null">receiver_id = #{receiverId},</if>
<if test="receiver != null">receiver = #{receiver},</if>
<if test="receiveTime != null">receive_time = #{receiveTime},</if> <if test="receiveTime != null">receive_time = #{receiveTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if> <if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="result != null">result = #{result},</if> <if test="result != null">`result` = #{result},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>