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

fhKeeper/formulahousekeeper/attendance-data/src/main/java/com/attendance/entity/HrmScheduleSign.java

@@ -36,10 +36,10 @@ public class HrmScheduleSign extends Model<HrmScheduleSign> {
     private String userId;
 
     @TableField("signDate")
-    private LocalDate signDate;
+    private String signDate;
 
     @TableField("signTime")
-    private LocalTime signTime;
+    private String signTime;
 
     @TableField(exist = false)
     private String clockInTime;

fhKeeper/formulahousekeeper/attendance-data/src/main/resources/application.yml

@@ -15,9 +15,9 @@ spring:
       location: C:/upload/
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://localhost:1433;database=atten_dev;encrypt=false
+    url: jdbc:sqlserver://172.10.31.161:1433;database=ecology;encrypt=false
     username: sa
-    password: Sqlserver_2023
+    password: cdsc@703
 
 ##########日志配置
 logging:

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

@@ -587,14 +587,16 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                         return msg;
                     }
                     expenseItem.setProjectId(project.get().getId());
-                    List<SubProject> subProjects = subProjectList.stream().filter(sl -> sl.getProjectId().equals(project.get().getId())).collect(Collectors.toList());
-                    Optional<SubProject> subProject = subProjects.stream().filter(s ->(StringUtils.isEmpty(s.getCode())?"":s.getCode()).equals(subCodeCell.getStringCellValue())
-                            || (StringUtils.isEmpty(s.getName())?"":s.getName()).equals(subCodeCell.getStringCellValue())).findFirst();
-                    if(!subProject.isPresent()){
-                        msg.setError("子项目["+subCodeCell.getStringCellValue()+"]不属于项目["+codeCell.getStringCellValue()+"]");
-                        return msg;
+                    if(subCodeCell!=null){
+                        List<SubProject> subProjects = subProjectList.stream().filter(sl -> sl.getProjectId().equals(project.get().getId())).collect(Collectors.toList());
+                        Optional<SubProject> subProject = subProjects.stream().filter(s ->(StringUtils.isEmpty(s.getCode())?"":s.getCode()).equals(subCodeCell.getStringCellValue())
+                                || (StringUtils.isEmpty(s.getName())?"":s.getName()).equals(subCodeCell.getStringCellValue())).findFirst();
+                        if(!subProject.isPresent()){
+                            msg.setError("子项目["+subCodeCell.getStringCellValue()+"]不属于项目["+codeCell.getStringCellValue()+"]");
+                            return msg;
+                        }
+                        expenseItem.setSubProjectId(subProject.get().getId());
                     }
-                    expenseItem.setSubProjectId(subProject.get().getId());
                     expenseItem.setExpenseId(expenseSheet.getId());
                     if(happenDateCell!=null && !happenDateCell.toString().trim().equals("")){
                         LocalDate happenDate = Instant.ofEpochMilli(happenDateCell.getDateCellValue().getTime())

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

@@ -678,7 +678,7 @@ public class TimingTask {
         JSONObject reqParam = new JSONObject();
         DateTimeFormatter date=DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DateTimeFormatter time=DateTimeFormatter.ofPattern("HH:mm");
-        List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().eq("company_name", "明夷"));
+        List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().eq("company_name", "成都明夷电子科技有限公司"));
         if(companyList.size()>0){
             Company company = companyList.get(0);
             Integer companyId = company.getId();

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1840,7 +1840,7 @@
         },
         data() {
             return {
-                mingyiName : '南京火石演示科技公司',
+                mingyiName : '成都明夷电子科技有限公司',
                 // mingyiName : '明夷',
                 modItemDataId: null,
                 modImportTime: null,