From ff87c12d358d21a4bb6d052a904b8debf1633d5e Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Fri, 29 Mar 2024 00:19:44 +0800
Subject: [PATCH] update code

---
 .../domain/SurProjectAttendanceUser.java      |  2 +-
 .../jh/project/task/AttendanceJgwTask.java    | 19 ++++++++++---------
 .../mapper/project/BaseBuildNodeMapper.xml    |  1 +
 .../project/SurProjectBuildNodeDataMapper.xml |  1 +
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
index 23e5c9fe..72f5fe17 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
@@ -217,7 +217,7 @@ public class SurProjectAttendanceUser extends BaseEntity
         u.ethnic=j.getString("minor");
         u.phone=j.getString("workPhone");
         u.nativePlace=j.getString("address");
-        u.gender=j.getLong("sex")==0l?1l:0l;
+        u.gender=j.getLongValue("sex",0)==0l?1l:0l;
         String tmp=j.getString("birthday");
         if(StrUtil.isNotEmpty(tmp)) {
             try {
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java
index 00d1f0a9..be1e6984 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java
@@ -107,8 +107,9 @@ public class AttendanceJgwTask {
 
         String appid="6a6f24fe35b04ee0bcf31cfb46ed1051";
         String secret="c3h5enh4MjAyNHN1Yw==";
-        String prjId="db955e11ef774e63968a47c3dc2acc15";//"b67f1baa6dca4558a16bf90a4681b82e";//
-        String phone="18171295380";
+        //String prjId="db955e11ef774e63968a47c3dc2acc15";//"b67f1baa6dca4558a16bf90a4681b82e";//
+        String prjId="e66a49d5550c49ffb030c49b84ccf8ea";//泾河新城荟锦坊二期
+        String phone="18392322772";
         String token= getToken(appid,secret);
         if(token==null || token.length()==0){
             return;
@@ -118,16 +119,16 @@ public class AttendanceJgwTask {
         String subcontractorId=new AttendanceJgwTask().getSubcontractor(appid,token,phone);
         String leaderTeamId="a643aaf5fdeb4c8fb0d8c7307881ce97";
         System.out.println(subcontractorId);
-        findWorkerByLeader(appid,token,leaderTeamId);
+        //findWorkerByLeader(appid,token,leaderTeamId);
         //findDirectlyUnderTeam(appid,token,prjId,subcontractorId,0);
         //queryProject(appid,token,phone,0);;
-        //findAddWorkerByProject(appid,token,prjId,0);
-        findUpdateWorkerByProject(appid,token,prjId,0);
+        findAddWorkerByProject(appid,token,prjId,0);
+        //findUpdateWorkerByProject(appid,token,prjId,0);
         //findAttendanceByProject(appid,token,prjId);
         //findTeamByProjectId(appid,token,prjId);
         //findProContractorByProjectId(appid,token,prjId);
         //getJobTypeData(appid,token,"0");
-        findDirectlyUnderTeam(appid,token,prjId);
+        //findDirectlyUnderTeam(appid,token,prjId);
     }
     public static void findDirectlyUnderTeam(String appId,String token,String projectId,String subcontractorId,int rowId){
         String path="/webapi/project/findDirectlyUnderTeam";
@@ -450,7 +451,7 @@ public class AttendanceJgwTask {
         if(arr.size()>0){
             for(int i=0;i<arr.size();i++){
                 JSONObject json=arr.getJSONObject(i);
-                SurProjectAttendanceGroup group=SurProjectAttendanceGroup.createJgw(json);
+                SurProjectAttendanceGroup group=SurProjectAttendanceGroup.createJgw(json,true);
                 group.setBizLicense(json.getString("corpCode"));
                 String type=json.getString("corpType");
                 if("009".equals(type)){ //总包人员
@@ -495,7 +496,7 @@ public class AttendanceJgwTask {
         if(arr.size()>0){
             for(int i=0;i<arr.size();i++){
                 JSONObject json=arr.getJSONObject(i);
-                SurProjectAttendanceGroup group=SurProjectAttendanceGroup.createJgw(json);
+                SurProjectAttendanceGroup group=SurProjectAttendanceGroup.createJgw(json,true);
                 group.setBizLicense(json.getString("corpCode"));
                 String type=json.getString("corpType");
                 if("009".equals(type)){ //总包人员
@@ -544,7 +545,7 @@ public class AttendanceJgwTask {
                     cnt++;
                 }
                SurProjectAttendanceUser user=SurProjectAttendanceUser.createFromJgw(json);
-                if(user.getName().equals("李文国")){
+                if(user.getName().equals("王利")){
                     String k=user.getName();
                     JSONArray arr2= json.getJSONArray("corpName");
                     Object o=arr2.get(0);
diff --git a/yanzhu-jh/src/main/resources/mapper/project/BaseBuildNodeMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/BaseBuildNodeMapper.xml
index e480f6f9..46fd1542 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/BaseBuildNodeMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/BaseBuildNodeMapper.xml
@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nodeType != null "> and node_lvl = #{nodeType}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
         </where>
+        ORDER BY node_lvl,id
     </select>
     
     <select id="selectBaseBuildNodeById" parameterType="Long" resultMap="BaseBuildNodeResult">
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
index 2a799fda..cc3600c0 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
@@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="files != null  and files != ''"> and files = #{files}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
         </where>
+        order by node_lvl,id
     </select>
     
     <select id="selectSurProjectBuildNodeDataById" parameterType="Long" resultMap="SurProjectBuildNodeDataResult">