anderx лет назад: 3
Родитель
Сommit
9e5808c0d8

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1123,6 +1123,9 @@
     <if test="depId != null">
       and e.order_dep= #{depId ,jdbcType=VARCHAR}
     </if>
+    <if test="thchId != null">
+      and a.task_receiver = #{thchId,jdbcType=VARCHAR}
+    </if>
     <if test="taskId != null">
       and (a.id= #{taskId,jdbcType=VARCHAR} or a.split_super= #{taskId,jdbcType=VARCHAR})
     </if>
@@ -1159,6 +1162,9 @@
     <if test="depId != null">
       and e.order_dep= #{depId ,jdbcType=VARCHAR}
     </if>
+    <if test="thchId != null">
+      and a.task_receiver = #{thchId,jdbcType=VARCHAR}
+    </if>
     <if test="orderNo != null">
       and a.order_no= #{orderNo,jdbcType=VARCHAR}
     </if>

+ 6 - 0
src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml

@@ -595,6 +595,9 @@ where x.id=  #{tid}
 		<if test="status !=null">
 		and a.status= #{status}
 		</if>
+     <if test="thchId != null">
+       and b.task_receiver = #{thchId,jdbcType=VARCHAR}
+     </if>
 		order by a.status,a.create_time desc
 		<if test="lvl==4">
 		,a.process_status
@@ -651,6 +654,9 @@ where x.id=  #{tid}
 		<if test="status !=null">
 		and a.status= #{status}
 		</if>
+     <if test="thchId != null">
+       and b.task_receiver = #{thchId,jdbcType=VARCHAR}
+     </if>
   </select>
  <select id="selectNodeList" resultType="com.goafanti.organization.bo.outNodeList">
 	  select c.contract_no contractNo,c.order_no orderNo,d.buyer_name userName,

+ 1 - 0
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -345,6 +345,7 @@ public class NewExcelUtil<T> {
 			// 得到导出对象.
 			T vo = (T) list.get(i);
 			int column = 0;
+			System.out.println(i);
 			for (Object[] os : fields) {
 				Field field = (Field) os[0];
 				Excel excel = (Excel) os[1];

+ 3 - 2
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -86,9 +86,10 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 任务派单查询
 	 */
 	@RequestMapping(value="/selectTaskList" ,method = RequestMethod.GET)
-	public Result selectTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially  ,String depId  ,Integer pageNo,Integer pageSize){
+	public Result selectTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially  ,String depId,String thchId
+			,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId  ,pageNo, pageSize));
+		res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,thchId  ,pageNo, pageSize));
 		return res;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -36,7 +36,7 @@ public interface OrderProjectService {
 
 
 	Pagination<TOrderTaskListBo>  selectTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,
-			Integer specially,String depId  , Integer pageNo, Integer pageSize);
+			Integer specially,String depId  ,String thchId, Integer pageNo, Integer pageSize);
 
 	List<TaskLogBo> TaskLogList(Integer id);
 

+ 2 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -838,7 +838,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderTaskListBo> selectTaskList(String name, String orderNo, String taskId, Integer taskStatus,
-			String adminName, Integer specially,String depId  , Integer pageNo, Integer pageSize) {
+			String adminName, Integer specially,String depId,String thchId  , Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -847,6 +847,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
+		if (StringUtils.isNotBlank(thchId)) params.put("thchId", thchId);
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
 		if (null != taskStatus) params.put("taskStatus", taskStatus);
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskListByPage", "selectTaskListCount", params, pageNo, pageSize);

+ 9 - 0
src/main/java/com/goafanti/organization/bo/InputPaymentList.java

@@ -11,12 +11,21 @@ public class InputPaymentList {
 	private String financeName;
 	private String cname;
 	private String pname;
+	private String thchId;
 	private Integer status;
 	private Integer chooseType;
 	private Integer pageSize;
 	private Integer pageNo;
 
 
+	public String getThchId() {
+		return thchId;
+	}
+
+	public void setThchId(String thchId) {
+		this.thchId = thchId;
+	}
+
 	public String getDeps() {
 		return deps;
 	}

+ 1 - 0
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -672,6 +672,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			map.put("deps", departmentService.parseArray(i.getDeps()));
 		}
 		if (i.getAname()!=null)map.put("aname", i.getAname());
+		if (i.getThchId()!=null)map.put("thchId", i.getThchId());
 		if (i.getFinanceName()!=null)map.put("financeName", i.getFinanceName());
 		if (i.getCname()!=null)map.put("cname", i.getCname());
 		if (i.getPname()!=null)map.put("pname", i.getPname());