Browse Source

项目统计相关接口修改

anderx 3 years ago
parent
commit
f1d028c83d

+ 1 - 3
src/main/java/com/goafanti/common/dao/TTaskMidMapper.java

@@ -29,9 +29,7 @@ public interface TTaskMidMapper {
 
     void updateByTid(TTaskMid tm);
 
-    void addValue(Integer xzs, Integer bhs);
-
-
     TTaskMid selectCountBytid(@Param("tid")Integer tid, @Param("type")Integer type);
 
+    TTaskMid getDtails(Integer id);
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/TTaskMidMapper.xml

@@ -436,5 +436,12 @@
     on a.tid =b.tid
     where a.tid= #{tid}
   </select>
+  <select id="getDtails" resultType="com.goafanti.common.model.TTaskMid">
+    select a.id tid,dg.id dispatchProvince,tr.department_id dutyDep
+    from t_order_task a left join t_order_new b on a.order_no =b.order_no
+    left join department c on b.order_dep =c.id  left join admin tr on a.task_receiver =tr.id
+    left join district_glossory dg on c.province =dg.id
+    where a.id= #{id};
+  </select>
 
 </mapper>

+ 5 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -433,7 +433,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 			tOrderTaskMapper.insertSelectiveGetId(tOrderTaskBo);
 			int y=tOrderTaskBo.getId();
-			tTaskMidMapper.insertSelective(new TTaskMid(y,new BigDecimal(0)));
+			TTaskMid dtails = tTaskMidMapper.getDtails(tOrderTaskBo.getId());
+			TTaskMid tTaskMid = new TTaskMid(y, new BigDecimal(0));
+			tTaskMid.setDispatchProvince(dtails.getDispatchProvince());
+			tTaskMid.setDutyDep(dtails.getDutyDep());
+			tTaskMidMapper.insertSelective(tTaskMid);
 			if(tOrderTaskBo.getSplitStatus()==1) {
 				map.put(x, y);
 			}

+ 4 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -196,6 +196,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 		}
 		tm.setHighNewRetrial(highNewRetrial);
+		TTaskMid dtails = tTaskMidMapper.getDtails(t.getId());
+		TTaskMid tTaskMid = new TTaskMid(t.getId(), new BigDecimal(0));
+		tTaskMid.setDispatchProvince(dtails.getDispatchProvince());
+		tTaskMid.setDutyDep(dtails.getDutyDep());
 		tTaskMidMapper.insertSelective(tm);
 		return 1;
 	}

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

@@ -936,8 +936,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				newTask.setSplitId(i);
 				i++;
 				tOrderTaskMapper.insertSelectiveGetId(newTask);
-				TTaskMid tm=new TTaskMid(newTask.getId(),null);
-				tTaskMidMapper.insertSelective(tm);
+				TTaskMid dtails = tTaskMidMapper.getDtails(newTask.getId());
+				TTaskMid tTaskMid = new TTaskMid(newTask.getId(), new BigDecimal(0));
+				tTaskMid.setDispatchProvince(dtails.getDispatchProvince());
+				tTaskMid.setDutyDep(dtails.getDutyDep());
+				tTaskMidMapper.insertSelective(tTaskMid);
 			}
 		return 1;
 	}

+ 4 - 4
src/main/java/com/goafanti/weChat/bo/InputPublicDtails.java

@@ -1,7 +1,7 @@
 package com.goafanti.weChat.bo;
 
 public class InputPublicDtails {
-	
+
 	private String releaseStart;
 	private String releaseEnd;
 	private String aid;
@@ -15,7 +15,7 @@ public class InputPublicDtails {
 	private String sid;
 	private String depId;
 	/**
-	 * 0业务/行政 1技术
+	 * 0业务 1技术 2行政
 	 */
 	private Integer publicType;
 	private Integer pageSize;
@@ -101,6 +101,6 @@ public class InputPublicDtails {
 	public void setClockIn(Integer clockIn) {
 		this.clockIn = clockIn;
 	}
-	
-	
+
+
 }