Browse Source

新增订单项目完成状态

anderx 1 year ago
parent
commit
7e34c9710f

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

@@ -3002,5 +3002,17 @@
         delete from t_order_task
         where split_super = #{id,jdbcType=INTEGER}
     </delete>
+    <update id="updateDimissionTransferManager">
+        update t_order_task
+        set manager_id= #{transferId}
+        where manager_id = #{aid}
+    </update>
+
+    <select id="selectAll" resultMap="TOrderTaskMap" >
+        select
+        <include refid="TOrderTaskAllSql" />
+        from t_order_task
+        where split_status in (0,2)
+    </select>
 </mapper>
 

+ 4 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -2087,12 +2087,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			ObjectMapper mapper = new ObjectMapper();
 			try {
 				Map map = mapper.readValue(timeRecord, Map.class);
-				//高新 10已下证 科技 18立项已拨款 专利/软著 19已完成/下证 会员 27全部完成
-				String[] str={"10","18","19","27"};
+
+				String[] str={"4","5","6","7","8","9","10","11","13","14","15","16","17","18","19","20","27"};
 				String date = null;
 				for (String s : str) {
 					if (StringUtils.isEmpty(date)){
-						date=pushStr(s,map);
+						String s1 = pushStr(s, map);
+						if (s1!=null)date=s1;
 					}
 
 				}