提交北森对接

提交美莱德bug
提交企业微信审核对接

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserWithBeisenController.java

@@ -83,6 +83,9 @@ public class UserWithBeisenController {
                 userWithBeisen.setMobilePhone(employeeInfo.getString("mobilePhone"));
                 userWithBeisen.setName(employeeInfo.getString("name"));
                 userWithBeisen.setUserId(employeeInfo.getString("userID"));
+                if(recordInfo.containsKey("extOTWagetype_110324_985711501")){
+                    userWithBeisen.setExtOTWagetype(recordInfo.getIntValue("extOTWagetype_110324_985711501"));
+                }
                 Optional<UserWithBeisen> first = allBeisenList.stream().filter(a ->a.getJobNumber()!=null&& a.getJobNumber().equals(recordInfo.getString("jobNumber"))).findFirst();
                 if(first.isPresent()){
                     userWithBeisen.setId(first.get().getId());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -511,112 +511,6 @@ public class WeiXinCorpController {
         return "success";
     }
 
-
-    public static void main(String[] args) {
-        org.json.JSONObject jsonObject = XML.toJSONObject("<xml>\n" +
-                "  <ToUserName><![CDATA[ww1cSD21f1e9c0caaa]]></ToUserName>\n" +
-                "  <FromUserName><![CDATA[sys]]></FromUserName>\n" +
-                "  <CreateTime>1571732272</CreateTime>\n" +
-                "  <MsgType><![CDATA[event]]></MsgType>\n" +
-                "  <Event><![CDATA[sys_approval_change]]></Event>\n" +
-                "  <AgentID>3010040</AgentID>\n" +
-                "  <ApprovalInfo>\n" +
-                "    <SpNo>201910220003</SpNo>\n" +
-                "    <SpName><![CDATA[示例模板]]></SpName>\n" +
-                "    <SpStatus>1</SpStatus>\n" +
-                "    <TemplateId><![CDATA[3TkaH5KFbrG9heEQWLJjhgpFwmqAFB4dLEnapaB7aaa]]></TemplateId>\n" +
-                "    <ApplyTime>1571728713</ApplyTime>\n" +
-                "    <Applyer>\n" +
-                "      <UserId><![CDATA[WuJunJie]]></UserId>\n" +
-                "      <Party><![CDATA[1]]></Party>\n" +
-                "    </Applyer>\n" +
-                "    <SpRecord>\n" +
-                "      <SpStatus>1</SpStatus>\n" +
-                "      <ApproverAttr>2</ApproverAttr>\n" +
-                "      <Details>\n" +
-                "        <Approver>\n" +
-                "          <UserId><![CDATA[WangXiaoMing]]></UserId>\n" +
-                "        </Approver>\n" +
-                "        <Speech><![CDATA[]]></Speech>\n" +
-                "        <SpStatus>1</SpStatus>\n" +
-                "        <SpTime>0</SpTime>\n" +
-                "      </Details>\n" +
-                "      <Details>\n" +
-                "        <Approver>\n" +
-                "          <UserId><![CDATA[XiaoGangHuang]]></UserId>\n" +
-                "        </Approver>\n" +
-                "        <Speech><![CDATA[]]></Speech>\n" +
-                "        <SpStatus>1</SpStatus>\n" +
-                "        <SpTime>0</SpTime>\n" +
-                "      </Details>\n" +
-                "    </SpRecord>\n" +
-                "    <SpRecord>\n" +
-                "      <SpStatus>1</SpStatus>\n" +
-                "      <ApproverAttr>1</ApproverAttr>\n" +
-                "      <Details>\n" +
-                "        <Approver>\n" +
-                "          <UserId><![CDATA[XiaoHongLiu]]></UserId>\n" +
-                "        </Approver>\n" +
-                "        <Speech><![CDATA[]]></Speech>\n" +
-                "        <SpStatus>1</SpStatus>\n" +
-                "        <SpTime>0</SpTime>\n" +
-                "      </Details>\n" +
-                "    </SpRecord>\n" +
-                "    <Notifyer>\n" +
-                "      <UserId><![CDATA[ChengLiang]]></UserId>\n" +
-                "    </Notifyer>\n" +
-                "    <Comments>\n" +
-                "      <CommentUserInfo>\n" +
-                "        <UserId><![CDATA[LiuZhi]]></UserId>\n" +
-                "      </CommentUserInfo>\n" +
-                "      <CommentTime>1571732272</CommentTime>\n" +
-                "      <CommentContent><![CDATA[这是一个备注]]></CommentContent>\n" +
-                "      <CommentId><![CDATA[6750538708562308220]]></CommentId>\n" +
-                "    </Comments>\n" +
-                "    <StatuChangeEvent>10</StatuChangeEvent>\n" +
-                "  </ApprovalInfo>\n" +
-                "</xml>\n").getJSONObject("xml");
-        org.json.JSONObject approvalInfo = jsonObject.getJSONObject("ApprovalInfo");
-        Long spNo = approvalInfo.getLong("SpNo");
-        int status = approvalInfo.getInt("SpStatus");
-        System.out.println(spNo);
-        System.out.println(status);
-        if(approvalInfo.has("SpRecord")){
-            org.json.JSONArray spRecord = approvalInfo.getJSONArray("SpRecord");
-            System.out.println(spRecord.toList());
-            for (int i = 0; i < spRecord.length(); i++) {
-                org.json.JSONObject object = spRecord.getJSONObject(i);
-                if(object.has("Details")){
-                    Object Details = object.get("Details");
-                    if(Details instanceof  org.json.JSONArray){
-                        org.json.JSONArray details = object.getJSONArray("Details");
-                        for (int i1 = 0; i1 < details.length(); i1++) {
-                            org.json.JSONObject detail = details.getJSONObject(i1);
-                            if(detail.has("Approver")){
-                                org.json.JSONObject approver = detail.getJSONObject("Approver");
-                                //分支审批人审批状态：1-审批中；2-已同意；3-已驳回；4-已转审
-                                int spStatus = detail.getInt("SpStatus");
-                                String userId = approver.getString("UserId");
-                                System.out.println(spStatus);
-                                System.out.println(userId);
-                            }
-                        }
-                    }else if(Details instanceof  org.json.JSONObject){
-                        org.json.JSONObject detail = object.getJSONObject("Details");
-                        if(detail.has("Approver")){
-                            org.json.JSONObject approver = detail.getJSONObject("Approver");
-                            //分支审批人审批状态：1-审批中；2-已同意；3-已驳回；4-已转审
-                            int spStatus = detail.getInt("SpStatus");
-                            String userId = approver.getString("UserId");
-                            System.out.println(spStatus);
-                            System.out.println(userId);
-                        }
-                    }
-                }
-            }
-        }
-
-    }
     //"企业微信数据回调"
     @RequestMapping(value = "/dataCallback/{corpId}", method = RequestMethod.POST)
     @ResponseBody

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/UserWithBeisen.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2024-01-09
+ * @since 2024-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -57,6 +57,12 @@ public class UserWithBeisen extends Model<UserWithBeisen> {
     @TableField("company_id")
     private Integer companyId;
 
+    /**
+     * 加班补偿方式 3-无加班人员 4-加班费人员
+     */
+    @TableField("extOTWagetype")
+    private Integer extOTWagetype;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -8179,7 +8179,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<LocalDateTime> dateTimeList=getDays(sDate, eDate);
             //针对美莱德 去除2024-02-09
             if(user.getCompanyId()==876){
-                dateTimeList=dateTimeList.stream().filter(d->d.isEqual(LocalDate.parse(startDate).atTime(LocalTime.MIN))).collect(Collectors.toList());
+                dateTimeList=dateTimeList.stream().filter(d->!d.isEqual(LocalDate.parse("2024-02-09").atTime(LocalTime.MIN))).collect(Collectors.toList());
             }
             List<Map<String,Object>> dataList=new ArrayList<>();
             long days =dateTimeList.size();
@@ -8229,12 +8229,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     List<LocalDateTime> leaveDateList = getDays(leaveSheet.getStartDate().atTime(LocalTime.MIN), leaveSheet.getEndDate().atTime(LocalTime.MIN));
                     //针对美莱德 去除2024-02-09
                     if(user.getCompanyId()==876){
-                        leaveDateList=leaveDateList.stream().filter(d->d.isEqual(LocalDate.parse("2024-02-09").atTime(LocalTime.MIN))).collect(Collectors.toList());
+                        leaveDateList=leaveDateList.stream().filter(d->!d.isEqual(LocalDate.parse("2024-02-09").atTime(LocalTime.MIN))).collect(Collectors.toList());
                     }
                     List<LocalDateTime> list = getDays(leaveSheet.getStartDate().atTime(LocalTime.now()), leaveSheet.getEndDate().atTime(LocalTime.now()));
                     //针对美莱德 去除2024-02-09
                     if(user.getCompanyId()==876){
-                        list=list.stream().filter(d->d.isEqual(LocalDate.parse("2024-02-09").atTime(LocalTime.MIN))).collect(Collectors.toList());
+                        list=list.stream().filter(d->!d.isEqual(LocalDate.parse("2024-02-09").atTime(LocalTime.MIN))).collect(Collectors.toList());
                     }
                     if(list.size()>1){
                         days-=list.size();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4398,10 +4398,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             map.put("createDate", date);
             //针对景昱 5978 校验填报工时是否超过考勤
             if(user.getCompanyId().equals(5978)){
+                map.put("exceedCardTime",0);
                 Optional<UserFvTime> first = userFvTimeList.stream().filter(u -> u.getWorkDate().isEqual(LocalDate.parse(date, df)) && u.getUserId().equals(id)).findFirst();
                 if(first.isPresent()){
-                    if(Double.valueOf(String.valueOf(data.get("workingTime")))>first.get().getWorkHours()){
-                        map.put("isOver",1);
+                    if(first.get().getWorkHours()!=null){
+                        if(Double.valueOf(String.valueOf(data.get("workingTime")))>first.get().getWorkHours()){
+                            map.put("exceedCardTime",1);
+                        }
                     }
                 }
             }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/BeiSenUtils.java

@@ -103,6 +103,7 @@ public class BeiSenUtils {
         columns.add("Name");
         columns.add("StaffID");
         columns.add("UserID");
+        columns.add("extOTWagetype_110324_985711501");
         if(companyId!=null && companyId==5789){
             requestMap.put("columns",columns);
         }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserWithBeisenMapper.xml

@@ -10,11 +10,12 @@
         <result column="mobile_phone" property="mobilePhone" />
         <result column="job_number" property="jobNumber" />
         <result column="company_id" property="companyId" />
+        <result column="extOTWagetype" property="extOTWagetype" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, name, mobile_phone, job_number, company_id
+        id, user_id, name, mobile_phone, job_number, company_id, extOTWagetype
     </sql>
 
 </mapper>