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

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/CompanyDingdingMapper.java

@@ -18,4 +18,6 @@ public interface CompanyDingdingMapper extends BaseMapper<CompanyDingding> {
 
     @Select("select corpid, corp_name, company_id from company_dingding left join company on company.id = company_dingding.company_id where company.set_meal = 1 and company.expiration_date > now()")
     public List<CompanyDingding> getServicedDingdingCompanyList();
+
+    List<CompanyDingding> getDingdingCompanyList();
 }

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

@@ -7960,7 +7960,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             project.setCategoryName(mainOptional.get().getCategoryName());
                             project.setCategory(mainOptional.get().getCategoryId());
                         }else {
-                            project.setProjectMainName(null);
+                            ProjectMain projectMain=new ProjectMain();
+                            projectMain.setCompanyId(thirdPartyInterface.getCompanyId());
+                            projectMain.setName(project.getProjectMainName());
+                            projectMainMapper.insert(projectMain);
+                            project.setProjectMainId(projectMain.getId());
                         }
                     }else {
                         Optional<ProjectCategory> category = projectCategoryList.stream().filter(pc -> pc.getName().equals(project.getCategoryName())).findFirst();
@@ -7970,7 +7974,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             project.setCategoryName(category.get().getName());
                             project.setCategory(category.get().getId());
                         }else {
-                            project.setCategoryName(null);
+                            ProjectCategory projectCategory=new ProjectCategory();
+                            projectCategory.setCompanyId(thirdPartyInterface.getCompanyId());
+                            projectCategory.setName(project.getCategoryName());
+                            projectCategoryMapper.insert(projectCategory);
+                            project.setCategoryName(projectCategory.getName());
+                            project.setCategory(projectCategory.getId());
                         }
                     }
                     if(timeType.getProjectLevelState()==1){

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

@@ -575,7 +575,7 @@ public class TimingTask {
     @Scheduled(cron = "0 10 9 ? * *")
     private void alertWaitingApprove() {
         if (isDev) return;
-        List<CompanyDingding> list = companyDingdingService.list(new QueryWrapper<CompanyDingding>());
+        List<CompanyDingding> list = companyDingdingMapper.getDingdingCompanyList();
         for (CompanyDingding companyDingding : list) {
             List<Map<String, Object>> result = reportMapper.getWaitingApproveCnt(companyDingding.getCompanyId());
             for (Map<String, Object> map : result) {

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

@@ -26,4 +26,12 @@
         corpid, corp_name, auth_user_id, indate, company_id, access_token, expire_time, agent_id, inner_appkey, inner_appsecret, inner_token, inner_expire_time, web_url, pc_web_url, oa_manager_dingid
     </sql>
 
+    <select id="getDingdingCompanyList" resultType="com.management.platform.entity.CompanyDingding">
+        select *
+        from company_dingding
+        left join company
+        ON company_dingding.company_id = company.id
+        where company.expiration_date >= now()
+    </select>
+
 </mapper>