Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

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

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author Seyason
- * @since 2022-07-04
+ * @since 2022-08-31
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -25,8 +25,8 @@ public class ThirdPartyInterface extends Model<ThirdPartyInterface> {
 
     private static final long serialVersionUID=1L;
 
-    @TableId("comapny_id")
-    private Integer comapnyId;
+    @TableId("company_id")
+    private Integer companyId;
 
     @TableField("token")
     private String token;
@@ -40,7 +40,7 @@ public class ThirdPartyInterface extends Model<ThirdPartyInterface> {
 
     @Override
     protected Serializable pkVal() {
-        return this.comapnyId;
+        return this.companyId;
     }
 
 }

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

@@ -3993,14 +3993,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             return msg;
         }
         ThirdPartyInterface thirdPartyInterface = thirdPartyInterfaceList.get(0);
-        List<ReportLog> reportLogList = reportLogMapper.selectList(new QueryWrapper<ReportLog>().eq("company_id", thirdPartyInterface.getComapnyId()).orderByAsc("operate_date"));
-        List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", thirdPartyInterface.getComapnyId()));
+        List<ReportLog> reportLogList = reportLogMapper.selectList(new QueryWrapper<ReportLog>().eq("company_id", thirdPartyInterface.getCompanyId()).orderByAsc("operate_date"));
+        List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", thirdPartyInterface.getCompanyId()));
         if(LocalDateTime.now().isAfter(thirdPartyInterface.getExpireTime())){
             msg.setError("token过期失效");
             return msg;
         }
         if(token.equals(thirdPartyInterface.getToken())){
-            List<HashMap<String, Object>> allReportByDate = reportMapper.getAllReportByDate(startDate,thirdPartyInterface.getComapnyId(), null, endDate, null, null, null);
+            List<HashMap<String, Object>> allReportByDate = reportMapper.getAllReportByDate(startDate,thirdPartyInterface.getCompanyId(), null, endDate, null, 1, null);
             for (HashMap<String, Object> map : allReportByDate) {
                 java.sql.Date sqlCreateDate= (java.sql.Date) map.get("createDate");
                 java.sql.Timestamp sqlProjectAuditTime= (Timestamp) map.get("projectAuditTime");

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -334,7 +334,7 @@ public class TimingTask {
         List<ThirdPartyInterface> thirdPartyInterfaceList = thirdPartyInterfaceMapper.selectList(null);
         List<String> collect = thirdPartyInterfaceList.stream().map(tf -> tf.getToken()).collect(Collectors.toList());
         for (ThirdPartyInterface thirdPartyInterface : thirdPartyInterfaceList) {
-            if(thirdPartyInterface.getComapnyId()==862) continue;
+            if(thirdPartyInterface.getCompanyId()==862) continue;
             List<String> stringList=new ArrayList<>();
             new SecureRandom().ints(passwordLength, 0, VALID_TOKEN_CHARS.size())
                     .map(VALID_TOKEN_CHARS::get).forEach(v->stringList.add(String.valueOf((char) v)));

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

@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.ThirdPartyInterface">
-        <id column="comapny_id" property="comapnyId" />
+        <id column="company_id" property="companyId" />
         <result column="token" property="token" />
         <result column="expire_time" property="expireTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        comapny_id, token, expire_time
+        company_id, token, expire_time
     </sql>
 
 </mapper>