工单

zwrx-api/src/main/java/api/controller/order/WorkOrderController.java

@@ -3,6 +3,7 @@ package api.controller.order;
 import api.entity.database.order.*;
 import api.entity.database.system.Dept;
 import api.entity.input.order.FeedbackInput;
+import api.entity.input.order.QueryWorkOrderInput;
 import api.entity.input.order.VisitInput;
 import api.service.order.*;
 import api.service.system.IConfigService;
@@ -57,70 +58,12 @@ public class WorkOrderController extends BaseController {
     @ApiOperation("工单列表")
     @Log(title = "查询工单列表",businessType = BusinessType.QUERY)
     @GetMapping
-    public AjaxResult getList(WorkOrder input, PageInput pageInput) {
-        LambdaQueryWrapper<WorkOrder> qw = new LambdaQueryWrapper();
-        qw.eq(input.getId() != null && input.getId() > 0, WorkOrder::getId, input.getId());
-        qw.like(!StringHelper.isEmpty(input.getWorkOrderId()), WorkOrder::getWorkOrderId, input.getWorkOrderId());
-        qw.like(!StringHelper.isEmpty(input.getResult()), WorkOrder::getResult, input.getResult());
-        qw.eq(input.getWorkState() != null && input.getWorkState() > 0, WorkOrder::getWorkState, input.getWorkState());
-        qw.eq(input.getReloadState() != null && input.getReloadState() > 0, WorkOrder::getReloadState, input.getReloadState());
-        qw.eq(input.getLimitTime() != null , WorkOrder::getLimitTime, input.getLimitTime());
-        qw.like(!StringHelper.isEmpty(input.getCreateUser()), WorkOrder::getCreateUser, input.getCreateUser());
-        qw.like(!StringHelper.isEmpty(input.getCreateUserName()), WorkOrder::getCreateUserName, input.getCreateUserName());
-        qw.eq(input.getEnableTime() != null , WorkOrder::getEnableTime, input.getEnableTime());
-        qw.eq(input.getIsDelete() != null && input.getIsDelete() > 0, WorkOrder::getIsDelete, input.getIsDelete());
-        qw.eq(input.getDeleteTime() != null , WorkOrder::getDeleteTime, input.getDeleteTime());
-        qw.like(!StringHelper.isEmpty(input.getDeleteUser()), WorkOrder::getDeleteUser, input.getDeleteUser());
-        qw.eq(input.getCloseTime() != null , WorkOrder::getCloseTime, input.getCloseTime());
-        qw.like(!StringHelper.isEmpty(input.getCloseUser()), WorkOrder::getCloseUser, input.getCloseUser());
-        qw.like(!StringHelper.isEmpty(input.getDealUser()), WorkOrder::getDealUser, input.getDealUser());
-        qw.eq(input.getDealTime() != null , WorkOrder::getDealTime, input.getDealTime());
-        qw.eq(input.getIsSatisfied() != null && input.getIsSatisfied() > 0, WorkOrder::getIsSatisfied, input.getIsSatisfied());
-        qw.eq(input.getMainWorkOrder() != null && input.getMainWorkOrder() > 0, WorkOrder::getMainWorkOrder, input.getMainWorkOrder());
-        qw.eq(input.getIsReturn() != null && input.getIsReturn() > 0, WorkOrder::getIsReturn, input.getIsReturn());
-        qw.eq(input.getSubmitTime() != null , WorkOrder::getSubmitTime, input.getSubmitTime());
-        qw.like(!StringHelper.isEmpty(input.getAssignUser()), WorkOrder::getAssignUser, input.getAssignUser());
-        qw.eq(input.getAssignTime() != null , WorkOrder::getAssignTime, input.getAssignTime());
-        qw.eq(input.getAssignId() != null && input.getAssignId() > 0, WorkOrder::getAssignId, input.getAssignId());
-        qw.eq(input.getIsReload() != null && input.getIsReload() > 0, WorkOrder::getIsReload, input.getIsReload());
-        qw.like(!StringHelper.isEmpty(input.getMainDeptId()), WorkOrder::getMainDeptId, input.getMainDeptId());
-        qw.like(!StringHelper.isEmpty(input.getDealDeptId()), WorkOrder::getDealDeptId, input.getDealDeptId());
-        qw.like(!StringHelper.isEmpty(input.getMainDeptId3()), WorkOrder::getMainDeptId3, input.getMainDeptId3());
-        qw.eq(input.getIsUnsuccessful() != null && input.getIsUnsuccessful() > 0, WorkOrder::getIsUnsuccessful, input.getIsUnsuccessful());
-        qw.like(!StringHelper.isEmpty(input.getUnsuccessful()), WorkOrder::getUnsuccessful, input.getUnsuccessful());
-        qw.eq(input.getUnsuccessfulState() != null && input.getUnsuccessfulState() > 0, WorkOrder::getUnsuccessfulState, input.getUnsuccessfulState());
-        qw.eq(input.getIsOpen() != null && input.getIsOpen() > 0, WorkOrder::getIsOpen, input.getIsOpen());
-        qw.eq(input.getRePush() != null && input.getRePush() > 0, WorkOrder::getRePush, input.getRePush());
-        qw.like(!StringHelper.isEmpty(input.getAdditionalReply()), WorkOrder::getAdditionalReply, input.getAdditionalReply());
-        qw.eq(input.getIsMedia() != null && input.getIsMedia() > 0, WorkOrder::getIsMedia, input.getIsMedia());
-        qw.eq(input.getIsSendBack() != null && input.getIsSendBack() > 0, WorkOrder::getIsSendBack, input.getIsSendBack());
-        qw.eq(input.getSpotCheck() != null && input.getSpotCheck() > 0, WorkOrder::getSpotCheck, input.getSpotCheck());
-        qw.eq(input.getRemind() != null && input.getRemind() > 0, WorkOrder::getRemind, input.getRemind());
-        qw.eq(input.getUnsuccessfulTime() != null , WorkOrder::getUnsuccessfulTime, input.getUnsuccessfulTime());
-        qw.like(!StringHelper.isEmpty(input.getNoResult()), WorkOrder::getNoResult, input.getNoResult());
-        qw.eq(input.getOrderSign() != null && input.getOrderSign() > 0, WorkOrder::getOrderSign, input.getOrderSign());
-        qw.eq(input.getIsEncryption() != null && input.getIsEncryption() > 0, WorkOrder::getIsEncryption, input.getIsEncryption());
-        qw.eq(input.getPublicComment() != null && input.getPublicComment() > 0, WorkOrder::getPublicComment, input.getPublicComment());
-        qw.eq(input.getSmsTime() != null , WorkOrder::getSmsTime, input.getSmsTime());
-        qw.eq(input.getAdditionalReplyTime() != null , WorkOrder::getAdditionalReplyTime, input.getAdditionalReplyTime());
-        qw.eq(input.getNoExamine() != null && input.getNoExamine() > 0, WorkOrder::getNoExamine, input.getNoExamine());
-        qw.eq(input.getIsVisit() != null && input.getIsVisit() > 0, WorkOrder::getIsVisit, input.getIsVisit());
-        qw.eq(input.getVisitSatisfied() != null && input.getVisitSatisfied() > 0, WorkOrder::getVisitSatisfied, input.getVisitSatisfied());
-        qw.eq(input.getCompletionStatus() != null && input.getCompletionStatus() > 0, WorkOrder::getCompletionStatus, input.getCompletionStatus());
-        qw.eq(input.getIsSupervise() != null && input.getIsSupervise() > 0, WorkOrder::getIsSupervise, input.getIsSupervise());
-        qw.eq(input.getIsEnabled() != null && input.getIsEnabled() > 0, WorkOrder::getIsEnabled, input.getIsEnabled());
-        qw.eq(input.getIsBusiness() != null && input.getIsBusiness() > 0, WorkOrder::getIsBusiness, input.getIsBusiness());
-        qw.eq(input.getSuperviseState() != null && input.getSuperviseState() > 0, WorkOrder::getSuperviseState, input.getSuperviseState());
-        qw.eq(input.getSource() != null && input.getSource() > 0, WorkOrder::getSource, input.getSource());
-        qw.like(!StringHelper.isEmpty(input.getAuditContent()), WorkOrder::getAuditContent, input.getAuditContent());
-        qw.eq(input.getCreateTime() != null , WorkOrder::getCreateTime, input.getCreateTime());
+    public AjaxResult getList(QueryWorkOrderInput input, PageInput pageInput) throws IllegalAccessException {
+        LambdaQueryWrapper<WorkOrder> qw = new LambdaQueryWrapper<>();
+        qw.orderByDesc(WorkOrder::getId);
         Page<WorkOrder> page = GetPage(pageInput);
-        if (page != null) {
-            IPage<WorkOrder> iPage = workorderService.getListPage(page, qw);
-            return Success("成功", iPage.getRecords(), iPage.getTotal());
-        } else {
-            return Success("成功", workorderService.getList(qw));
-        }
+        IPage<WorkOrder> iPage = workorderService.SelectWorkOrderList(page,input);
+        return Success("成功",iPage.getRecords());
     }
     @ApiOperation("查询工单详情")
     @Log(title = "查询工单详情",businessType = BusinessType.QUERY)

zwrx-entity/src/main/java/api/entity/database/order/SubmeterOrder.java

@@ -74,8 +74,7 @@ public class SubmeterOrder {
     /** 来电人姓名（对网络单位隐藏） */
     @ApiModelProperty("来电人姓名（对网络单位隐藏）")
     private String cusName;
-    /** 来电人性别(男，女，未知)
-     */
+    /** 来电人性别(男，女，未知)*/
     @ApiModelProperty("来电人性别(男，女，未知) ")
     private Long cusSex;
     /** 来电人电话（对网络单位隐藏）*/
@@ -84,7 +83,6 @@ public class SubmeterOrder {
     /** 来电人电话后四位*/
     @ApiModelProperty("来电人电话后四位")
     private String cusPhoneEncryption;
-
     /** 来电人地址 */
     @ApiModelProperty("来电人地址")
     private String cusAddress;

zwrx-entity/src/main/java/api/entity/database/order/WorkOrder.java

@@ -66,9 +66,6 @@ public class WorkOrder {
     /** 处理人 */
     @ApiModelProperty("处理人")
     private String dealUser;
-    /** 处理部门 */
-    @ApiModelProperty("处理部门")
-    private String dealDept;
     /** 处理时间 */
     @ApiModelProperty("处理时间")
     private Date dealTime;

zwrx-entity/src/main/java/api/entity/input/order/QueryWorkOrderInput.java

@@ -0,0 +1,90 @@
+package api.entity.input.order;
+
+
+import api.util.annotation.FieldCompare;
+import api.util.annotation.FieldParameter;
+import api.util.enums.FieldCompareType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.loader.collection.OneToManyJoinWalker;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "筛选项", description = "筛选项")
+public class QueryWorkOrderInput {
+    /** 工单id */
+    @ApiModelProperty("工单id")
+    private Long id;
+    /** 信息来源 */
+    @ApiModelProperty("信息来源")
+    private Long infoSource;
+    /** 形式分类（信息类别） */
+    @ApiModelProperty("形式分类（信息类别）")
+    private Long infoType;
+    /** 标签 */
+    @ApiModelProperty("标签")
+    private Long label;
+    /** 反映区域 */
+    @ApiModelProperty("反映区域")
+    private Long sourceArea;
+    @ApiModelProperty("是否保密(0:否1:是)")
+    private Long isProtect;
+    /** 来电人姓名（对网络单位隐藏） */
+    @ApiModelProperty("来电人姓名")
+    private String cusName;
+    /** 来电人性别(男，女，未知)*/
+    @ApiModelProperty("来电人性别")
+    private Long cusSex;
+    /** 电话号码*/
+    @ApiModelProperty("电话号码")
+    @FieldCompare(fieldType = FieldCompareType.or,
+     parameter = {@FieldParameter(parameter = "cusPhone"),
+             @FieldParameter(fieldType = FieldCompareType.like,parameter = "cusPhoneEncryption"),
+             @FieldParameter(fieldType = FieldCompareType.like,parameter = "conPhoneEncryption"),
+             @FieldParameter(parameter = "conPhone")} )
+    private String phone;
+    /** 联系人姓名 */
+    @ApiModelProperty("联系人姓名")
+    @FieldCompare(fieldType = FieldCompareType.eq)
+    private String conName;
+    /** 标题 */
+    @ApiModelProperty("标题")
+    @FieldCompare(fieldType = FieldCompareType.like)
+    private String comTitle;
+    /** 内容 */
+    @ApiModelProperty("内容")
+    @FieldCompare(fieldType = FieldCompareType.like)
+    private String comContent;
+    /** 是否直办（及时答复）0:否,1:是 */
+    @ApiModelProperty("是否直办（及时答复）0:否,1:是")
+    private Long isResult;
+    /** 反映类别 */
+    @ApiModelProperty("反映类别")
+    private Long dicKey;
+    /** 紧急程度1普通2紧急 */
+    @ApiModelProperty("紧急程度1普通2紧急")
+    private Long level;
+    /** 工单内容 */
+    @ApiModelProperty("工单内容")
+    @FieldCompare(fieldType = FieldCompareType.like)
+    private String content;
+    @ApiModelProperty("处理结果（及时答复结果）")
+    @FieldCompare(fieldType = FieldCompareType.like)
+    private String result;
+
+    @ApiModelProperty("开始时间")
+    @FieldCompare(fieldType = FieldCompareType.ge,singleParameter ="createTime")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date StartTime;
+    /** 关键字 */
+    @ApiModelProperty("结束时间")
+    @FieldCompare(fieldType = FieldCompareType.le,singleParameter ="createTime")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date EndTime;
+}
+
+

zwrx-entity/src/main/java/api/entity/view/order/WorkOrderView.java

@@ -0,0 +1,61 @@
+package api.entity.view.order;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class WorkOrderView {
+    /** id */
+    @ApiModelProperty("工单id")
+    private Long id;
+    /** 工单编号 */
+    @ApiModelProperty("工单编号")
+    private String workOrderId;
+    /** 处理结果（及时答复结果） */
+    @ApiModelProperty("处理结果（及时答复结果）")
+    private String result;
+    /** 工单状态 */
+    @ApiModelProperty("工单状态")
+    private Long workState;
+    /** 登记人工号 */
+    @ApiModelProperty("登记人工号")
+    private String createUser;
+    /** 登记人姓名 */
+    @ApiModelProperty("登记人姓名")
+    private String createUserName;
+    /** 是否督办工单0否1是 */
+    @ApiModelProperty("是否督办工单0否1是")
+    private Long isSupervise;
+    /** 工单时限 */
+    @ApiModelProperty("工单时限")
+    private Date limitTime;
+    /** 主办单位多个单位逗号分隔 */
+    @ApiModelProperty("主办单位多个单位逗号分隔")
+    private String mainDeptId;
+    /** 其他来源工单编号 */
+    @ApiModelProperty("其他来源工单编号")
+    private String otherOrderId;
+    /** 标题 */
+    @ApiModelProperty("标题")
+    private String comTitle;
+    /** 内容 */
+    @ApiModelProperty("内容")
+    private String comContent;
+    /** 工单内容 */
+    @ApiModelProperty("工单内容")
+    private String content;
+    /** 通话记录id */
+    @ApiModelProperty("通话记录id")
+    private Long callRecordId;
+    /** 留言记录id */
+    @ApiModelProperty("留言记录id")
+    private Long leaveRecordId;
+    /** （关联工单主id，判断是否是关联工单） */
+    @ApiModelProperty("（关联工单主id，判断是否是关联工单）")
+    private Long mainWorkOrder;
+
+}

zwrx-mapper/src/main/java/api/mapper/order/WorkOrderMapper.java

@@ -1,8 +1,13 @@
 package api.mapper.order;
 
+import api.entity.database.system.User;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import api.entity.database.order.WorkOrder;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
@@ -10,4 +15,6 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
     public String SelectWorkOrderId(long source,String time);
     //生成办理时限
     public String SelectLimitTime(long day);
+    //分页工单列表
+    public IPage<WorkOrder> SelectWorkOrderList(IPage<WorkOrder> page, String sql);
 }

zwrx-mapper/src/main/resources/mapper/order/WorkOrderMapper.xml

@@ -11,7 +11,39 @@
     <select id="SelectLimitTime" resultType="String" >
         select  GetLimit(#{day})
     </select>
+    <resultMap type="api.entity.view.order.WorkOrderView" id="WorkOrderResult">
+        <id property="id" column="id"/>
+        <result property="workOrderId" column="work_order_id"/>
+        <result property="workState" column="work_state"/>
+        <result property="createUser" column="create_user"/>
+        <result property="createUserName" column="create_user_name"/>
+        <result property="isSupervise" column="is_supervise"/>
+        <result property="limitTime" column="limit_time"/>
+        <result property="result" column="result"/>
+        <result property="mainDeptId" column="main_dept_id"/>
+        <result property="otherOrderId" column="other_order_id"/>
+        <result property="comTitle" column="com_title"/>
+        <result property="content" column="content"/>
+        <result property="callRecordId" column="call_record_id"/>
+        <result property="leaveRecordId" column="leave_record_id"/>
+        <result property="mainWorkOrder" column="main_work_order"/>
+        <result property="comContent" column="com_content"/>
+    </resultMap>
 
+    <sql id="selectWorkOrderVo">
+        select w.id,w.work_order_id,w.work_state,w.create_user,w.create_user_name,w.is_supervise
+        ,w.limit_time,w.result,w.main_dept_id,
+        s.other_order_id,s.com_title,s.content,s.call_record_id,s.leave_record_id,w.main_work_order,s.com_content
+        from
+        bus_work_order w
+        inner join   bus_work_order_submeter s
+        where w.id=s.id and w.is_delete=0
+    </sql>
+
+    <select id="SelectWorkOrderList"  resultMap="WorkOrderResult">
+        <include refid="selectWorkOrderVo"/>
+        ${sql}
+    </select>
 
 
 </mapper>

zwrx-service/src/main/java/api/service/order/IWorkOrderService.java

@@ -2,17 +2,22 @@ package api.service.order;
 
 import api.entity.database.order.*;
 import api.entity.database.system.Dept;
+import api.entity.input.PageInput;
 import api.entity.input.order.FeedbackInput;
+import api.entity.input.order.QueryWorkOrderInput;
 import api.entity.input.order.VisitInput;
 import api.entity.input.order.WorkOrderInput;
 import api.entity.view.system.UserView;
 import api.service.IBaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.Date;
 import java.util.List;
 
 public interface IWorkOrderService extends IBaseService<WorkOrder> {
+    IPage<WorkOrder> SelectWorkOrderList(IPage<WorkOrder> page,QueryWorkOrderInput input) throws IllegalAccessException;
+
     //添加/修改工单信息
     boolean  operateWorkOrder(WorkOrderInput input, UserView User,long type);
     //提交工单

zwrx-service/src/main/java/api/service/order/impl/BusAssignInfoServiceImpl.java

@@ -2,6 +2,7 @@ package api.service.order.impl;
 
 import api.entity.database.order.*;
 import api.entity.database.system.Dept;
+import api.entity.database.system.User;
 import api.entity.input.order.FeedbackInput;
 import api.entity.view.system.UserView;
 import api.mapper.order.BusAssignInfoMapper;
@@ -13,9 +14,13 @@ import api.util.enums.BoolType;
 import api.util.enums.WorkSource;
 import api.util.enums.WorkState;
 import api.util.helper.StringHelper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import lombok.var;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,6 +56,8 @@ public class BusAssignInfoServiceImpl extends BaseServiceImpl<BusAssignInfoMappe
     private IBusDelayTimeService busDelayTimeService;
     @Autowired
     private IConfigService configService;
+
+
     //查收工单
     @Override
     public boolean receiveWorkOrder(List<Long> ids, UserView User) {

zwrx-service/src/main/java/api/service/order/impl/WorkOrderServiceImpl.java

@@ -3,15 +3,19 @@ package api.service.order.impl;
 import api.entity.database.order.*;
 import api.entity.database.system.Dept;
 import api.entity.database.system.Dic;
+import api.entity.database.system.User;
+import api.entity.input.PageInput;
+import api.entity.input.order.QueryWorkOrderInput;
 import api.entity.input.order.VisitInput;
 import api.entity.input.order.WorkOrderInput;
 import api.entity.view.system.UserView;
 import api.mapper.order.WorkOrderMapper;
-import api.mapper.system.DicMapper;
 import api.service.call.ICallLogService;
 import api.service.order.*;
 import api.service.BaseServiceImpl;
 import api.service.system.*;
+import api.util.annotation.FieldCompare;
+import api.util.annotation.FieldParameter;
 import api.util.enums.*;
 import api.util.helper.HttpHelper;
 import api.util.helper.SecretHelper;
@@ -19,13 +23,14 @@ import api.util.helper.StringHelper;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.var;
-import org.elasticsearch.ElasticsearchSecurityException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
 
+import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -90,6 +95,125 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     //乡镇表
     @Autowired
     private IAreaChildrenService areaChildrenService;
+    @Override
+    public IPage<WorkOrder> SelectWorkOrderList(IPage<WorkOrder> page,QueryWorkOrderInput input) throws IllegalAccessException {
+        Field[] fields = input.getClass().getDeclaredFields();
+        StringBuilder sql= new StringBuilder();
+        //遍历属性
+        for (Field field : fields) {
+            //通过setAccessible()设置为true,允许通过反射访问私有变量
+            field.setAccessible(true);
+            //获取属性值
+            Object value = field.get(input);
+            //获取属性名
+            String name = field.getName();
+            //获取字段类型
+            Class<?> type = field.getType();
+            FieldCompare annotation = field.getAnnotation(FieldCompare.class);
+            String compare=" = ";String singleParameter="";
+            FieldParameter[] parameter = null;
+            if (annotation != null) {
+                //获取比较方式默认等于
+                compare=annotation.fieldType().getValue();
+                singleParameter=annotation.singleParameter();
+                if(annotation.fieldType()==FieldCompareType.or)
+                {
+                    parameter=annotation.parameter();
+                }
+            }
+            String start="'";String end="'";
+            if (Date.class.isAssignableFrom(field.getType())) {
+                if (value!=null&&StringHelper.isNotEmpty(singleParameter))
+                {
+                    if(hasField(WorkOrder.class,singleParameter))
+                    {
+                        sql.append(" and w.").append(convert(singleParameter)).append(compare).append(start).append(value).append(end);
+                    }
+                    else   if(hasField(SubmeterOrder.class,singleParameter))
+                    {
+                        sql.append(" and S.").append(convert(singleParameter)).append(compare).append(start).append(value).append(end);
+                    }
+                }
+                else
+                {
+                    continue;
+                }
+                continue;
+            }
+            else   if (type.getName().equals("java.lang.Long"))
+            {
+                if (value!=null&&(Long)value>0L)
+                {
+                    if(StringHelper.isNotEmpty(singleParameter))
+                    {
+                        name=singleParameter;
+                    }
+                    if(hasField(WorkOrder.class,name))
+                    {
+                        sql.append(" and w.").append(convert(name)).append(compare).append(value);
+                    }
+                    else   if(hasField(SubmeterOrder.class,name))
+                    {
+                        sql.append(" and s.").append(convert(name)).append(compare).append(value);
+                    }
+                }
+                else
+                {
+                    continue;
+                }
+            }
+            if (type.getName().equals("java.lang.String"))
+            {
+
+                if (value!=null&&StringHelper.isNotEmpty(value.toString()))
+                {
+                    if (Objects.equals(compare, "or"))
+                    {
+                        sql.append(" and ").append("(");
+                        if (parameter != null)
+                        {
+                            for (int i = 0; i < parameter.length; i++) {
+                               if (i>0)
+                               {
+                                   sql.append(" or ");
+                               }
+                               String contrast=parameter[i].fieldType().getValue();
+                               if (Objects.equals(contrast, FieldCompareType.like.getValue()))
+                               {
+                                   start="'%";end ="%'";
+                               }
+                               if(hasField(WorkOrder.class,parameter[i].parameter()))
+                               {
+                                    sql.append("  w.").append(convert(parameter[i].parameter())).append(contrast).append(start).append(value).append(end);
+                               }
+                               else   if(hasField(SubmeterOrder.class,parameter[i].parameter()))
+                               {
+                                    sql.append("  s.").append(convert(parameter[i].parameter())).append(contrast).append(start).append(value).append(end);
+                               }
+                            }
+                        }
+                        sql.append(")");
+                    }
+                    else
+                    {
+                        if (Objects.equals(compare, FieldCompareType.like.getValue()))
+                        {
+                            start=" '%";end ="%'";
+                        }
+                        if(hasField(WorkOrder.class,name))
+                        {
+                            sql.append(" and w.").append(convert(name)).append(compare).append(start).append(value).append(end);
+                        }
+                        else   if(hasField(SubmeterOrder.class,name))
+                        {
+                            sql.append(" and s.").append(convert(name)).append(compare).append(start).append(value).append(end);
+                        }
+                    }
+               }
+            }
+        }
+      return orderMapper.SelectWorkOrderList(page, String.valueOf(sql));
+    }
     //添加/修改工单信息
     @Override
     public boolean operateWorkOrder(WorkOrderInput input, UserView User,long type) {
@@ -285,7 +409,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             Order.setContent(input.getContent());//工单内容
             if (StringHelper.isEmpty(input.getContent()))
             {
-                input.setContent(input.getComContent()); //工单内容默认来电内容
+                Order.setContent(input.getComContent()); //工单内容默认来电内容
             }
             Order.setVisitType(input.getVisitType());//0正常回访1无需回访
             Order.setTownship(input.getTownship());
@@ -2024,5 +2148,18 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
 
     }
+    // 使用正则表达式匹配大写字母，并将其替换为小写加下划线
+    private static String convert(String str) {
+        return str.replaceAll("([a-z])([A-Z])", "$1_$2").toLowerCase();
+    }
+    //判断字段是否在类中
+    public static boolean hasField(Class<?> clazz, String fieldName) {
+        try {
+            clazz.getDeclaredField(fieldName); // 尝试获取字段
+            return true; // 如果没有抛出异常，则字段存在
+        } catch (NoSuchFieldException e) {
+            return false; // 字段不存在
+        }
+    }
 
 }

zwrx-util/src/main/java/api/util/annotation/FieldCompare.java

@@ -0,0 +1,22 @@
+package api.util.annotation;
+
+import api.util.enums.FieldCompareType;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.List;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FieldCompare {
+    //比较值
+    FieldCompareType fieldType()  default FieldCompareType.eq;
+    //多参数
+    FieldParameter [] parameter() default {};
+    //单参数
+    String  singleParameter() default "";
+
+}

zwrx-util/src/main/java/api/util/annotation/FieldParameter.java

@@ -0,0 +1,18 @@
+package api.util.annotation;
+
+import api.util.enums.FieldCompareType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FieldParameter {
+
+    //比较值
+    FieldCompareType fieldType()  default FieldCompareType.eq;
+    //参数
+    String parameter() default "";
+}

zwrx-util/src/main/java/api/util/enums/FieldCompareType.java

@@ -0,0 +1,30 @@
+package api.util.enums;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public enum FieldCompareType {
+    @ApiModelProperty("大于")
+    gt(" > "),
+    @ApiModelProperty("大于等于")
+    ge(" >= "),
+    @ApiModelProperty("小于")
+    lt(" < "),
+    @ApiModelProperty("小于等于")
+    le(" <= "),
+    @ApiModelProperty("等于")
+    eq(" = "),
+    @ApiModelProperty("或")
+    or(" or "),
+    @ApiModelProperty("模糊")
+    like(" like ");
+
+    private final String value;
+    FieldCompareType(String value)
+    {
+        this.value=value;
+    }
+
+    public  String getValue(){
+        return value;
+    }
+}