Browse Source

新项目旧数据处理项目完成日期接口

anderx 1 year ago
parent
commit
415b63851f

+ 1 - 1
pom.xml

@@ -183,7 +183,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.8.2</version>
+			<version>2.13.4.1</version>
 		</dependency>
 		<!-- jackson end -->
 

+ 17 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -20,6 +20,7 @@ import com.goafanti.core.websocket.SystemWebSocketHandler;
 import com.goafanti.expenseAccount.service.ExpenseAccountService;
 import com.goafanti.order.enums.OrderImgEnums;
 import com.goafanti.order.service.OrderNewService;
+import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.user.service.UserService;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
@@ -94,6 +95,8 @@ public class PublicController extends CertifyApiController {
 	private ExpenseAccountService	expenseAccountService;
 	@Autowired
 	private OrderNewService orderNewService;
+	@Autowired
+	private OrderProjectService orderProjectService;
 
 	@Value(value = "${patentTemplate}")
 	private String					patentTemplate		= null;
@@ -965,4 +968,18 @@ public class PublicController extends CertifyApiController {
 	}
 
 
+	/**
+	 * 处理项目完成时间
+	 * @return
+	 */
+	@RequestMapping(value = "/pushProjectCompleteDate",method = RequestMethod.GET)
+	@ResponseBody
+	public Result pushProjectCompleteDate(){
+		Result res =new Result();
+		orderProjectService.pushProjectCompleteDate();
+		res.data("ok");
+		return res;
+	}
+
+
 }

+ 2 - 1
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -90,5 +90,6 @@ public interface TOrderTaskMapper {
 
     List<String> selectOrderNoAllByaid(String aid);
 
-    List<OutOrderProject> selectStatisticsOrderProject(InputOrderProject in);
+
+    List<TOrderTask> selectAll();
 }

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

@@ -2511,5 +2511,10 @@
     where manager_id = #{aid}
   </update>
 
-
+  <select id="selectAll" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from t_order_task
+    where split_status in (0,2)
+  </select>
 </mapper>

+ 1 - 0
src/main/java/com/goafanti/order/enums/NewProjectStatus.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 
 /**
+ * 项目状态 枚举
  * 	高新
  *	0未启动 1进行中 2暂停(客户通知暂停)3暂停(业务线通知暂停)4已提交 5未推荐 6已推荐 7未公示 8已公示 9已备案 10已下证
  *	11退单(已申报)12退单(未申报)28抽查未备案

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

@@ -149,4 +149,6 @@ public interface OrderProjectService {
     Object updateSatisfactionDegree(Integer id, Integer formRetrieve, Integer satisfactionDegree, String satisfactionDegreeUrl);
 
 	Object dispatchTaskLog(Integer id);
+
+    void pushProjectCompleteDate();
 }

+ 36 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1,6 +1,8 @@
 package com.goafanti.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.business.bo.InputRestrictProject;
 import com.goafanti.common.bo.Error;
@@ -2063,4 +2065,38 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		return tTaskLogMapper.selectByTid(id);
 	}
 
+	@Override
+	public void pushProjectCompleteDate() {
+		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectAll();
+		for (TOrderTask e : tOrderTasks) {
+			if (StringUtils.isNotEmpty(e.getTimeRecord())){
+				ObjectMapper mapper = new ObjectMapper();
+                try {
+					Map map = mapper.readValue(e.getTimeRecord(), Map.class);
+					//高新 10已下证 科技 18立项已拨款 专利/软著 19已完成/下证 会员 27全部完成
+					Map map2 = (Map) map.get("10");
+					Integer x=10;
+					if (map2==null){
+						map2 = (Map) map.get("18");
+						x=18;
+					}
+					if (map2==null) {
+						map2 = (Map) map.get("19");
+						x=19;
+					}
+					if (map2==null){
+						map2 = (Map) map.get("27");
+						x=27;
+					}
+					if(map2!=null){
+						String date = (String) map2.get("date");
+						System.out.println(x+"="+date);
+					}
+				} catch (JsonProcessingException ex) {
+                    throw new RuntimeException(ex);
+                }
+            }
+		}
+	}
+
 }