瀏覽代碼

Merge branch 'test2' into test

anderx 1 年之前
父節點
當前提交
41f6efea67

+ 0 - 1
pom.xml

@@ -462,7 +462,6 @@
 			<scope>compile</scope>
 		</dependency>
 
-
 	</dependencies>
 	<build>
 		<resources>

+ 11 - 1
src/main/java/com/goafanti/common/utils/HttpUtils.java

@@ -15,6 +15,7 @@ import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -101,5 +102,14 @@ public class HttpUtils {
 		return substring;
 	}
 
-
+	public static void main(String[] args) {
+//		JSONObject jsonObject = httpGet("https://oapi.dingtalk.com/gettoken?appkey=dingdstdmazod2ghnj2y&appsecret=E4b_1VJaL1_m3hUr2D4vvoP3KzLQpHB5pibRmWRr8cwq28vLPbpgFUO4MuryH39n");
+//		System.out.println(jsonObject.toJSONString());
+		//{"errcode":0,"access_token":"3c9596da886b366084a1e02a6683e2f9","errmsg":"ok","expires_in":7200}
+		Map<String ,Object >param=new HashMap<>();
+		param.put("userid","144431256935772788");
+		param.put("work_date","2024-03-01");
+		JSONObject jsonObject = httpPost("https://oapi.dingtalk.com/topapi/attendance/getupdatedata?access_token=6b2ab08b2c5a327cb86276fb34dbaf10", param, 1);
+		System.out.println(jsonObject.toJSONString());
+	}
 }

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

@@ -320,8 +320,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		Date lastSigningTime= tn.getSignTime();
 		if (!tOrderNewBos.isEmpty()){
 			for (TOrderNewBo e : tOrderNewBos) {
-				if (e.getSignTime().getTime()>lastSigningTime.getTime()){
-					lastSigningTime = e.getSignTime();
+				if(e.getSignTime()!=null){
+					if (e.getSignTime().getTime()>lastSigningTime.getTime()){
+						lastSigningTime = e.getSignTime();
+					}
 				}
 			}
 		}