fix:单次任务查询项添加

src/main/java/cn/ezhizao/project/business/entrust/mapper/BizEntrustMapper.java

@@ -4,6 +4,7 @@ import cn.ezhizao.project.business.entrust.domain.BizEntrust;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 委托Mapper接口
@@ -27,4 +28,5 @@ public interface BizEntrustMapper extends BaseMapper<BizEntrust>
      * @return 删除结果
     */
     public int physicalDelete(BizEntrust bizEntrust);
+    public List<Map<String,Object>> entrustSource(Long tenantId);
 }

src/main/java/cn/ezhizao/project/business/entrust/service/IBizEntrustService.java

@@ -4,6 +4,7 @@ import cn.ezhizao.project.business.entrust.domain.BizEntrust;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 委托Service接口
@@ -27,5 +28,5 @@ public interface IBizEntrustService extends IService<BizEntrust>
      * @return 删除结果
      */
     public int physicalDelete(BizEntrust bizEntrust);
-
+    public Map<Long,String> entrustSource(Long tenantId);
 }

src/main/java/cn/ezhizao/project/business/entrust/service/impl/BizEntrustServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.business.entrust.service.impl;
 
+import cn.ezhizao.framework.web.domain.server.Sys;
 import cn.ezhizao.project.business.entrust.domain.BizEntrust;
 import cn.ezhizao.project.business.entrust.mapper.BizEntrustMapper;
 import cn.ezhizao.project.business.entrust.service.IBizEntrustService;
@@ -7,7 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 委托Service业务层处理
@@ -40,5 +43,15 @@ public class BizEntrustServiceImpl  extends ServiceImpl<BizEntrustMapper, BizEnt
      */
     @Override
     public int physicalDelete(BizEntrust bizEntrust){ return bizEntrustMapper.physicalDelete(bizEntrust); };
-
+    @Override
+    public Map<Long,String> entrustSource(Long tenantId) {
+        List<Map<String,Object>> mapList = bizEntrustMapper.entrustSource(tenantId);
+        Map<Long,String> tenantMap = new HashMap<>();
+        mapList.forEach((map -> {
+            if(null != map.get("account_name")){
+                tenantMap.put((Long) map.get("from_tenant_id"), (String) map.get("account_name"));
+            }
+        }));
+        return tenantMap;
+    }
 }

src/main/java/cn/ezhizao/project/business/workOrder/controller/OnceWorkOrderProductionController.java

@@ -320,4 +320,11 @@ public class OnceWorkOrderProductionController extends BaseController {
         workOrderRecordService.updateById(bizWorkOrderRecord);
         return success("继续办理成功");
     }
+    @RequestMapping("entrustSource")
+    public AjaxResult entrustSource(Long tenantId) {
+        if(null == tenantId || tenantId == 0){
+            tenantId = getTenantId();
+        }
+        return success(entrustService.entrustSource(tenantId));
+    }
 }

src/main/resources/mybatis/business/BizEntrustMapper.xml

@@ -8,6 +8,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <id column="id" property="id"/>
     </resultMap>
 
+    <resultMap id="SourceResultMap" type="java.util.HashMap">
+        <result property="id" column="tenant_id"/>
+        <result property="name" column="account_name"/>
+    </resultMap>
 
     <select id="getList" parameterType="BizEntrust" resultMap="BizEntrustResult">
         SELECT * FROM biz_entrust
@@ -28,4 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <!-- 删除条件为其他外键可以在这里加 -->
         </trim>
     </delete>
+    <select id="entrustSource" resultType="java.util.HashMap" >
+        select entrustOrder.from_tenant_id,tenant.account_name
+        from biz_entrust_order entrustOrder
+                 left join biz_tenant tenant on entrustOrder.from_tenant_id = tenant.id
+        where entrustOrder.tenant_id = #{tenantId} or entrustOrder.from_tenant_id = #{tenantId}
+    </select>
 </mapper>

src/main/resources/mybatis/business/BizWorkOrderMapper.xml

@@ -70,6 +70,10 @@
                 and eb.work_order_id = t1.id
                 )
             </if>
+            <if test="formTenantId != null">
+
+                and t9.from_tenant_id = #{formTenantId}
+            </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}, '%'))
@@ -93,7 +97,28 @@
             <if test="monthNum != null ">AND t1.month_num = #{monthNum}</if>
             <if test="isStop != null ">AND t1.is_stop = #{isStop}</if>
             <if test="resultStatus != null">AND t7.result_status = #{resultStatus}</if>
-
+            <if test="entrustTimeFilter != null">
+                and t7.deleted = 0
+                AND (
+                DATE_FORMAT(t9.create_time,'%Y-%m-%d') &gt;= #{entrustTimeFilter[0]}
+                AND
+                DATE_FORMAT(t9.create_time,'%Y-%m-%d') &lt;= #{entrustTimeFilter[1]}
+                )
+            </if>
+            <if test="handlerTimeFilter != null">
+                AND (
+                DATE_FORMAT(t7.handler_time,'%Y-%m-%d') &gt;= #{handlerTimeFilter[0]}
+                AND
+                DATE_FORMAT(t7.handler_time,'%Y-%m-%d') &lt;= #{handlerTimeFilter[1]}
+                )
+            </if>
+            <if test="finishTimeFilter != null">
+                AND (
+                DATE_FORMAT(t7.finish_time,'%Y-%m-%d') &gt;= #{finishTimeFilter[0]}
+                AND
+                DATE_FORMAT(t7.finish_time,'%Y-%m-%d') &lt;= #{finishTimeFilter[1]}
+                )
+            </if>
             <if test="companyName != null">AND t2.name like concat('%', #{companyName}, '%')</if>
         </trim>
     </select>