周工时统计

pom.xml

@@ -40,6 +40,17 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.13</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>

src/main/java/com/galaxis/manatee/configuration/ManateeSecurity.java

@@ -40,6 +40,7 @@ public class ManateeSecurity extends WebSecurityConfigurerAdapter {
                 .antMatchers(HttpMethod.POST, SIGN_UP_URL).permitAll()
                 .antMatchers(HttpMethod.GET,GO_CONFIRM).permitAll()
                 .antMatchers(HttpMethod.GET,"/test/**").permitAll()
+                .antMatchers(HttpMethod.POST,"/test/**").permitAll()
                 .antMatchers(HttpMethod.GET,"/ws/**").permitAll()
                 .antMatchers(HttpMethod.POST,"/ws/**").permitAll()
                 .anyRequest().authenticated()

src/main/java/com/galaxis/manatee/controller/GetController.java

@@ -1,14 +1,21 @@
 package com.galaxis.manatee.controller;
 
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunCostCollectionDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunEquipmentDO;
 import com.galaxis.manatee.service.ChuanyunService;
 import com.galaxis.manatee.task.ChuanyunBasicDataScheduledTask;
 import com.galaxis.manatee.task.ChuanyunHumanResourceScheduledTask;
+import com.galaxis.manatee.util.ExcelUtils;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSON;
+import net.sf.json.JSONObject;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -19,6 +26,7 @@ import java.util.List;
  * @date 2020/6/7 10:26 上午
  */
 @RestController
+@Slf4j
 public class GetController {
 
     private final ChuanyunHumanResourceScheduledTask chuanyunHumanResourceScheduledTask;
@@ -133,5 +141,15 @@ public class GetController {
         chuanyunService.deleteProjectMember();
     }
 
+    /**
+     * 导入设备配置信息
+     * @param file
+     */
+    @PostMapping("/test/import")
+    public void importEquipment(@RequestParam(value="uploadFile", required = false) MultipartFile file){
+        List<ChuanyunEquipmentDO> list = ExcelUtils.readExcel("", ChuanyunEquipmentDO.class, file);
+        chuanyunService.importEquipment(list);
+    }
+
 
 }

src/main/java/com/galaxis/manatee/dao/ChuanyunEquipmentInformDao.java

@@ -0,0 +1,16 @@
+package com.galaxis.manatee.dao;
+
+import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunEquipmentInformDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPayrollDO;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ChuanyunEquipmentInformDao extends GalaxisRepository<ChuanyunEquipmentInformDO,String> {
+    /**
+     * 获取设备信息
+     * @param equipmentCode
+     * @return
+     */
+    ChuanyunEquipmentInformDO findByEquipmentCode(String equipmentCode);
+}

src/main/java/com/galaxis/manatee/dao/ChuanyunReimbursementAmountDao.java

@@ -9,6 +9,6 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface ChuanyunReimbursementAmountDao extends GalaxisRepository<ChuanyunReimbursementAmountDO,String> {
 
-    @Query(value="SELECT SUM(chuanyun_reimbursement.amount) AS total_amount,chuanyun_reimbursement.object_id  FROM chuanyun_reimbursement WHERE chuanyun_reimbursement.group_project_id = ?",nativeQuery = true)
+    @Query(value="SELECT SUM(chuanyun_reimbursement.amount) AS total_amount,chuanyun_reimbursement.object_id  FROM chuanyun_reimbursement WHERE chuanyun_reimbursement.group_project_id = ? and chuanyun_reimbursement.status=1",nativeQuery = true)
     ChuanyunReimbursementAmountDO getAmount(String projectId);
 }

src/main/java/com/galaxis/manatee/dao/ChuanyunSelfCostDao.java

@@ -40,6 +40,7 @@ public interface ChuanyunSelfCostDao extends GalaxisRepository<ChuanyunSelfCostD
     @Query(value="SELECT * FROM chuanyun_self_cost " +
             "WHERE user_id = ?1 " +
             "AND project_id = ?2 " +
-            "AND DATE_FORMAT(chuanyun_self_cost.day_log_date,'%Y-%m')=DATE_FORMAT(?3,'%Y-%m') AND status=?4",nativeQuery = true)
-    ChuanyunSelfCostDO getOldSelfDO(@Param("userId")String userId,@Param("projectId")String projectId,@Param("dayLogDate")String dayLogDate,String status);
+            "AND project_type=?3" +
+            " AND DATE_FORMAT(chuanyun_self_cost.day_log_date,'%Y-%m')=DATE_FORMAT(?4,'%Y-%m') AND status=?5",nativeQuery = true)
+    ChuanyunSelfCostDO getOldSelfDO(@Param("userId")String userId,@Param("projectId")String projectId,@Param("projectType") String projectType,@Param("dayLogDate")String dayLogDate,String status);
 }

src/main/java/com/galaxis/manatee/dao/ChuanyunSelfWorkHourDao.java

@@ -24,7 +24,7 @@ public interface ChuanyunSelfWorkHourDao extends GalaxisRepository<ChuanyunSelfW
      * @param dayLogDate    日志日期
      * @return  日工时记录
      */
-    ChuanyunSelfWorkHourDO findByUserIdAndAndProjectIdAndAndDayLogDate(String userId, String projectId, LocalDateTime dayLogDate);
+    ChuanyunSelfWorkHourDO findByUserIdAndAndProjectIdAndAndDayLogDateAndProjectType(String userId, String projectId, LocalDateTime dayLogDate,String projectType);
 
     /**
      * 根据用户Id，项目Id，起止时间获取工时列表
@@ -35,7 +35,7 @@ public interface ChuanyunSelfWorkHourDao extends GalaxisRepository<ChuanyunSelfW
      * @param end       结束时间
      * @return  日工时列表
      */
-    List<ChuanyunSelfWorkHourDO> findAllByUserIdAndProjectIdAndStatusAndDayLogDateBetween(String userId,String projectId,String status,LocalDateTime start,LocalDateTime end);
+    List<ChuanyunSelfWorkHourDO> findAllByUserIdAndProjectIdAndProjectTypeAndStatusAndDayLogDateBetween(String userId,String projectId,String projectType,String status,LocalDateTime start,LocalDateTime end);
 
     /**
      * 获取人员-项目-月度标准总工时

src/main/java/com/galaxis/manatee/dao/ChuanyunWeekMemberHourDao.java

@@ -4,6 +4,7 @@ import com.galaxis.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectCostDO;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunWeekMemberHourDO;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -34,6 +35,7 @@ public interface ChuanyunWeekMemberHourDao extends GalaxisRepository<ChuanyunWee
             "FROM chuanyun_self_work_hour " +
             "WHERE project_id !='' " +
             "GROUP BY chuanyun_self_work_hour.project_id," +
+            "chuanyun_self_work_hour.project_type," +
             "chuanyun_self_work_hour.user_id," +
             "DATE_FORMAT(day_log_date,'%Y')," +
             "WEEKOFYEAR(chuanyun_self_work_hour.day_log_date)," +
@@ -41,6 +43,28 @@ public interface ChuanyunWeekMemberHourDao extends GalaxisRepository<ChuanyunWee
     List<ChuanyunWeekMemberHourDO> getWeekMemberHour();
 
     /**
+     * 判断是否有流程中数据
+     * @return
+     */
+    @Query(value="SELECT chuanyun_self_work_hour.object_id," +
+            "DATE_FORMAT(day_log_date,'%Y') as year," +
+            "WEEKOFYEAR(chuanyun_self_work_hour.day_log_date) AS week," +
+            "project_id,user_id," +
+            "SUM(standard_work_hour)AS standard_work_hour," +
+            "project_type," +
+            "`status`" +
+            "FROM chuanyun_self_work_hour " +
+            "WHERE project_id=?1 and user_id=?2 and DATE_FORMAT(day_log_date,'%Y')=?3 and " +
+            "WEEKOFYEAR(chuanyun_self_work_hour.day_log_date)=?4 and status=2 and project_type=?5" +
+            " GROUP BY chuanyun_self_work_hour.project_id," +
+            "chuanyun_self_work_hour.project_type," +
+            "chuanyun_self_work_hour.user_id," +
+            "DATE_FORMAT(day_log_date,'%Y')," +
+            "WEEKOFYEAR(chuanyun_self_work_hour.day_log_date)," +
+            "chuanyun_self_work_hour.`status`",nativeQuery = true)
+    ChuanyunWeekMemberHourDO getProcessWeekHour(@Param("projectId")String projectId,@Param("userId")String userId,@Param("year")String year,@Param("week")String week,@Param("projectType")String projectType);
+
+    /**
      * 项目人员周度是否存在
      * @param projectId
      * @param userId
@@ -48,4 +72,9 @@ public interface ChuanyunWeekMemberHourDao extends GalaxisRepository<ChuanyunWee
      * @return
      */
     ChuanyunWeekMemberHourDO findByProjectIdAndUserIdAndWeekAndStatusAndProjectTypeAndYear(String projectId,String userId,String week,String status,String projectType,String year);
+
+    /**
+     * 删除状态为审核中的数据
+     */
+    void deleteByProjectIdAndUserIdAndYearAndWeekAndStatusAndProjectType(String projectId,String userId,String year,String week,String status,String projectType);
 }

src/main/java/com/galaxis/manatee/dao/ChuanyunWorkHourDao.java

@@ -30,9 +30,10 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "FROM chuanyun_day_log "+
             "LEFT JOIN chuanyun_log ON chuanyun_day_log.parent_object_id = chuanyun_log.object_id " +
             " WHERE chuanyun_log.user_id = ? " +
-            "AND chuanyun_log.log_date>='2020-08-01'" +
+//            "AND chuanyun_log.log_date>='2020-08-01'" +
             " GROUP BY chuanyun_day_log.project_id," +
             "chuanyun_log.user_id," +
+            "chuanyun_day_log.project_type," +
             "chuanyun_log.status," +
             "chuanyun_day_log.day_log_date",
             nativeQuery = true)

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunBudgetAmountDO.java

@@ -2,12 +2,17 @@ package com.galaxis.manatee.entity.chuanyun.data.object;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.galaxis.manatee.util.ChuanyunLocalDateTimeDeserializer;
+import com.galaxis.manatee.util.ChuanyunLocalDateTimeSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.persistence.Entity;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Slf4j
 @EqualsAndHashCode(callSuper = true)
@@ -40,6 +45,14 @@ public class ChuanyunBudgetAmountDO extends BasicDO{
     private BigDecimal budgetAmount;
 
     /**
+     * 默认日期（4月份）
+     */
+    @JsonProperty("F0000006")
+    @JsonSerialize(using = ChuanyunLocalDateTimeSerializer.class)
+    @JsonDeserialize(using = ChuanyunLocalDateTimeDeserializer.class)
+    private LocalDateTime date;
+
+    /**
      * 决算金额
      */
     @JsonProperty("F0000004")

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunEquipmentDO.java

@@ -0,0 +1,52 @@
+package com.galaxis.manatee.entity.chuanyun.data.object;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.galaxis.manatee.entity.chuanyun.dto.ExcelColumn;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.persistence.Entity;
+
+@Slf4j
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Entity(name = "CHUANYUN_EQUIPMENT")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ChuanyunEquipmentDO extends BasicDO{
+
+
+    /**
+     * 表名
+     */
+    public static final String SCHEMA_CODE ="D001789784c1058ac774a7eba4459cc0c134ecd";
+
+    /**
+     * 设备编号
+     */
+    @ExcelColumn(value = "设备编号", col = 1)
+    @JsonProperty("F0000001")
+    private String equipmentCode;
+
+    /**
+     * 设备配置编号
+     */
+    @ExcelColumn(value = "设备配置编号", col = 2)
+    @JsonProperty("F0000002")
+    private String equipmentConfigureCode;
+
+    /**
+     * 设备配置属性
+     */
+    @ExcelColumn(value = "设备配置属性", col = 3)
+    @JsonProperty("F0000003")
+    private String equipmentConfigureAttribute;
+
+    /**
+     * 设备配置值
+     */
+    @ExcelColumn(value = "设备配置值", col = 4)
+    @JsonProperty("F0000004")
+    private String equipmentConfigureValue;
+}

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunEquipmentInformDO.java

@@ -0,0 +1,32 @@
+package com.galaxis.manatee.entity.chuanyun.data.object;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.persistence.Entity;
+
+@Slf4j
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Entity(name = "CHUANYUN_EQUIPMENT_INFORM")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ChuanyunEquipmentInformDO extends BasicDO{
+
+    /**
+     * 表名
+     */
+    public static final String SCHEMA_CODE ="D001789b1361b805094469c983b94de0aa57881";
+
+    @JsonProperty("F0000001")
+    private String equipmentCode;
+
+    @JsonProperty("F0000002")
+    private String equipmentMaterielCode;
+
+    @JsonProperty("F0000003")
+    private String projectId;
+}

src/main/java/com/galaxis/manatee/entity/chuanyun/dto/ExcelColumn.java

@@ -0,0 +1,34 @@
+package com.galaxis.manatee.entity.chuanyun.dto;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 自定义实体类所需要的bean(Excel属性标题、位置等)
+ *
+ * @author Lynch
+ *
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ExcelColumn {
+    /**
+     * Excel标题
+     *
+     * @return
+     * @author Lynch
+     */
+    String value() default "";
+
+    /**
+     * Excel从左往右排列位置
+     *
+     * @return
+     * @author Lynch
+     */
+    int col() default 0;
+}

src/main/java/com/galaxis/manatee/service/ChuanyunService.java

@@ -1,6 +1,7 @@
 package com.galaxis.manatee.service;
 
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunCostCollectionDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunEquipmentDO;
 import org.springframework.scheduling.annotation.Async;
 
 import java.util.List;
@@ -31,4 +32,9 @@ public interface ChuanyunService {
      * 将领导从特定项目中剔除
      */
     void deleteProjectMember();
+
+    /**
+     * 设备配置信息导入
+     */
+    void importEquipment(List<ChuanyunEquipmentDO> list);
 }

src/main/java/com/galaxis/manatee/service/impl/ChuanyunServiceImpl.java

@@ -8,6 +8,7 @@ import com.galaxis.capsule.bo.ChuanyunObject;
 import com.galaxis.manatee.constant.ChuanYunConstant;
 import com.galaxis.manatee.constant.StringConstant;
 import com.galaxis.manatee.dao.ChuanyunCostCollectionDao;
+import com.galaxis.manatee.dao.ChuanyunEquipmentInformDao;
 import com.galaxis.manatee.dao.ChuanyunUserCompanyDao;
 import com.galaxis.manatee.entity.chuanyun.data.object.*;
 import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunSaveDTO;
@@ -34,12 +35,14 @@ public class ChuanyunServiceImpl implements ChuanyunService {
     private final ChuanYunManager chuanYunManager;
     private final ChuanyunCostCollectionDao chuanyunCostCollectionDao;
     private final ChuanyunUserCompanyDao chuanyunUserCompanyDao;
+    private final ChuanyunEquipmentInformDao chuanyunEquipmentInformDao;
     private String[] leader = {"e1feb431-91fd-4a01-8d81-a2e618b571ff","1c8c4dfa-7e22-4f4e-a672-3e080e01a283","18bf4c09-f7d7-4c01-8509-ec554c6592f0","9df86c86-87f4-4d91-ba1e-29657c6cdb65","3fcbf0e0-bf06-411b-9ce4-b77dc897ee93","0fb67380-3408-4786-bac4-44dfef738110"};
 
-    public ChuanyunServiceImpl(ChuanYunManager chuanYunManager, ChuanyunCostCollectionDao chuanyunCostCollectionDao, ChuanyunUserCompanyDao chuanyunUserCompanyDao) {
+    public ChuanyunServiceImpl(ChuanYunManager chuanYunManager, ChuanyunCostCollectionDao chuanyunCostCollectionDao, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunEquipmentInformDao chuanyunEquipmentInformDao) {
         this.chuanYunManager = chuanYunManager;
         this.chuanyunCostCollectionDao = chuanyunCostCollectionDao;
         this.chuanyunUserCompanyDao = chuanyunUserCompanyDao;
+        this.chuanyunEquipmentInformDao = chuanyunEquipmentInformDao;
     }
 
     @Override
@@ -216,6 +219,40 @@ public class ChuanyunServiceImpl implements ChuanyunService {
         }
     }
 
+    @Override
+    public void importEquipment(List<ChuanyunEquipmentDO> list) {
+        var objectMapper=new ObjectMapper();
+        list.forEach(chuanyunEquipmentDO -> {
+            //更新氚云
+            try {
+//                List<String> matchers = new ArrayList<>();
+//                matchers.add("F0000001_2,"+chuanyunEquipmentDO.getEquipmentCode());
+//                var filter= Filter.instance(0,1,true,"And",matchers);
+//                var chuanyunFindAllResponse=chuanYunManager.findAll(ChuanyunEquipmentDO.SCHEMA_CODE,filter);
+                ChuanyunEquipmentInformDO chuanyunEquipmentInformDO = chuanyunEquipmentInformDao.findByEquipmentCode(chuanyunEquipmentDO.getEquipmentCode());
+                if (chuanyunEquipmentInformDO!=null){
+                    chuanyunEquipmentDO.setEquipmentCode(chuanyunEquipmentInformDO.getObjectId());
+                }
+                EquipmentDTO equipmentDTO = new EquipmentDTO(chuanyunEquipmentDO);
+                var equipmentString = objectMapper.writeValueAsString(equipmentDTO);
+                ChuanyunSaveDTO chuanyunSaveDTO;
+//                if (chuanyunFindAllResponse.getReturnData()!=null) {
+//                    List<ChuanyunEquipmentDO> result=objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>(){});
+//                    chuanyunSaveDTO = chuanYunManager.update(ChuanyunEquipmentDO.SCHEMA_CODE,result.get(0).getObjectId(),equipmentString);
+//                }else {
+                    chuanyunSaveDTO = chuanYunManager.save(ChuanyunEquipmentDO.SCHEMA_CODE,equipmentString,true);
+//                }
+                if (chuanyunSaveDTO.getSuccessful()){
+                    log.info("新增项目配置信息成功");
+                }else {
+                    log.error("新增项目配置信息失败");
+                }
+            } catch (JsonProcessingException | BigSizeException e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
     /**
      * 如果没有项目组成员，判断是否是EBG的实施、研发二开、售后维保项目，如果是，则添加EBG全体成员
      * @param chuanyunGroupProjectDO    项目对象
@@ -287,6 +324,50 @@ public class ChuanyunServiceImpl implements ChuanyunService {
     }
 
     @Data
+    class EquipmentDTO{
+        /**
+         * 设备编号
+         */
+        @JsonProperty("F0000001")
+        private String equipmentCode;
+
+        /**
+         * 设备配置编号
+         */
+        @JsonProperty("F0000002")
+        private String equipmentConfigureCode;
+
+        /**
+         * 设备配置属性
+         */
+        @JsonProperty("F0000003")
+        private String equipmentConfigureAttribute;
+
+        /**
+         * 设备配置值
+         */
+        @JsonProperty("F0000004")
+        private String equipmentConfigureValue;
+
+        public EquipmentDTO(ChuanyunEquipmentDO chuanyunEquipmentDO){
+            if (null!=chuanyunEquipmentDO){
+                if (null!=chuanyunEquipmentDO.getEquipmentCode()){
+                    this.equipmentCode=chuanyunEquipmentDO.getEquipmentCode();
+                }
+                if (null!=chuanyunEquipmentDO.getEquipmentConfigureAttribute()){
+                    this.equipmentConfigureAttribute=chuanyunEquipmentDO.getEquipmentConfigureAttribute();
+                }
+                if (null!=chuanyunEquipmentDO.getEquipmentConfigureCode()){
+                    this.equipmentConfigureCode=chuanyunEquipmentDO.getEquipmentConfigureCode();
+                }
+                if (null!=chuanyunEquipmentDO.getEquipmentConfigureValue()){
+                    this.equipmentConfigureValue=chuanyunEquipmentDO.getEquipmentConfigureValue();
+                }
+            }
+        }
+    }
+
+    @Data
     static class ProjectUpdateDTO{
 
         @JsonProperty("OwnerId")

src/main/java/com/galaxis/manatee/task/ChuanyunHumanResourceScheduledTask.java

@@ -70,7 +70,7 @@ public class ChuanyunHumanResourceScheduledTask {
         //由于需要统计流程中的日志，在日志数据同步时将状态为2的数据一并统计
 //        matchersString.add("Status_2,1");
         matchersString.add("Status_6,[1;2]");
-        matchersString.add("logDate_4,2020-08-01 00:00:00");
+//        matchersString.add("logDate_4,2020-08-01 00:00:00");
         while (flag) {
             Long startTime= Instant.now().getEpochSecond();
             try {
@@ -251,7 +251,7 @@ public class ChuanyunHumanResourceScheduledTask {
         List<String> matchersString=new ArrayList<>();
         //由于需要统计流程中的日志，在日志数据同步时将状态为2的数据一并统计
         matchersString.add("Status_6,[1;2]");
-        matchersString.add("logDate_1,2020-08-01 00:00:00");
+//        matchersString.add("logDate_1,2020-08-01 00:00:00");
         while (flag) {
             Long startTime= Instant.now().getEpochSecond();
             try {

src/main/java/com/galaxis/manatee/task/WorkHourAnalysis.java

@@ -37,7 +37,7 @@ public class WorkHourAnalysis {
         this.chuanYunManager = chuanYunManager;
     }
 
-        @Scheduled(fixedDelay = 3600000L)
+    @Scheduled(cron = "0 0 0 * * *")
     private void standardDayWorkAbcHour() {
         standardDayAbcHour();
            // standardChuanyunDayWorkAbcHour();

src/main/java/com/galaxis/manatee/task/WorkHourStatistics.java

@@ -22,6 +22,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -110,13 +111,13 @@ public class WorkHourStatistics {
                 ChuanyunWorkHourDO chuanyunWorkHourDO = chuanyunWorkHourDao.getDayWorkHour(chuanyunUserCompanyDO.getUserId(),self.getDayLogDate());
                 //工时标准化
                 if (chuanyunWorkHourDO != null) {
-                    if (chuanyunWorkHourDO.getHoursWorked().compareTo(standard)<0) {
+                    if (chuanyunWorkHourDO.getHoursWorked().compareTo(standard)<=0) {
                         chuanyunSelfWorkHourDO.setStandardWorkHour(self.getHoursWorked());
                     }else {
                         BigDecimal personDays = (self.getHoursWorked().divide(chuanyunWorkHourDO.getHoursWorked(), 2, RoundingMode.HALF_UP)).multiply(standard);
                         chuanyunSelfWorkHourDO.setStandardWorkHour(personDays);
                     }
-                    ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO1 = chuanyunSelfWorkHourDao.findByUserIdAndAndProjectIdAndAndDayLogDate(chuanyunUserCompanyDO.getUserId(),ChuanYunConstant.PRODUCTION_PROJECT.equals(self.getProjectType())?ChuanYunConstant.PRODUCTION_PROJECT_ID:self.getProjectId(),self.getDayLogDate());
+                    ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO1 = chuanyunSelfWorkHourDao.findByUserIdAndAndProjectIdAndAndDayLogDateAndProjectType(chuanyunUserCompanyDO.getUserId(),ChuanYunConstant.PRODUCTION_PROJECT.equals(self.getProjectType())?ChuanYunConstant.PRODUCTION_PROJECT_ID:self.getProjectId(),self.getDayLogDate(),self.getProjectType());
                     if (chuanyunSelfWorkHourDO1!=null) {
                         chuanyunSelfWorkHourDao.delete(chuanyunSelfWorkHourDO1);
                     }
@@ -136,8 +137,7 @@ public class WorkHourStatistics {
     @Scheduled(fixedDelay = 3600000L)
     private void standardWeeklyWorkHour() {
         long start=Instant.now().getEpochSecond();
-        //删除数据库中审批中的数据，防止重复记录工时
-//        chuanyunWeekMemberHourDao.deleteAllByStatus("2");
+
         //更新数据库
         log.info("开始周工时标准化");
         List<ChuanyunWeekMemberHourDO> list = chuanyunWeekMemberHourDao.getWeekMemberHour();
@@ -156,6 +156,13 @@ public class WorkHourStatistics {
                     chuanyunWeekMemberHourDao.delete(oldWeekHour);
                 }
                 chuanyunWeekMemberHourDao.save(weekMemberHourDO);
+                //搜索是否还有处于审批中的数据
+                ChuanyunWeekMemberHourDO processWeekHour = chuanyunWeekMemberHourDao.getProcessWeekHour(chuanyunWeekMemberHourDO.getProjectId(),chuanyunWeekMemberHourDO.getUserId(),chuanyunWeekMemberHourDO.getYear(),chuanyunWeekMemberHourDO.getWeek(),chuanyunWeekMemberHourDO.getProjectType());
+                if (processWeekHour == null){
+                    chuanyunWeekMemberHourDao.deleteByProjectIdAndUserIdAndYearAndWeekAndStatusAndProjectType(chuanyunWeekMemberHourDO.getProjectId(),chuanyunWeekMemberHourDO.getUserId(),chuanyunWeekMemberHourDO.getYear(),chuanyunWeekMemberHourDO.getWeek(),"2",chuanyunWeekMemberHourDO.getProjectType());
+                    //同时删除氚云钟数据
+                    deleteExamineStatus(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE,"F0000007","F0000001",chuanyunWeekMemberHourDO.getProjectId(),"F0000002",chuanyunWeekMemberHourDO.getUserId(),"F0000008",chuanyunWeekMemberHourDO.getYear(),"","","F0000006",chuanyunWeekMemberHourDO.getWeek(),"F0000003",chuanyunWeekMemberHourDO.getProjectType());
+                }
             }
         });
         log.info("周工时标准化"+(Instant.now().getEpochSecond()-start)+"秒");
@@ -192,9 +199,10 @@ public class WorkHourStatistics {
     private void standardMonthlyHour(ChuanyunUserCompanyDO chuanyunUserCompanyDO) {
         //删除上一次状态为审核中，但本次已经审核通过的数据
         chuanyunSelfCostDao.findAllByStatusAndUserId(ChuanYunConstant.IN_PROCESS,chuanyunUserCompanyDO.getUserId()).forEach(chuanyunSelfCostDO -> {
-            List<ChuanyunSelfWorkHourDO> chuanyunSelfWorkHourList=chuanyunSelfWorkHourDao.findAllByUserIdAndProjectIdAndStatusAndDayLogDateBetween(
+            List<ChuanyunSelfWorkHourDO> chuanyunSelfWorkHourList=chuanyunSelfWorkHourDao.findAllByUserIdAndProjectIdAndProjectTypeAndStatusAndDayLogDateBetween(
                     chuanyunSelfCostDO.getUserId(),
                     chuanyunSelfCostDO.getProjectId(),
+                    chuanyunSelfCostDO.getProjectType(),
                     ChuanYunConstant.IN_PROCESS,
                     chuanyunSelfCostDO.getDayLogDate(),
                     chuanyunSelfCostDO.getDayLogDate().plusMonths(1L));
@@ -207,6 +215,7 @@ public class WorkHourStatistics {
                 matchers.add("F0000003_2,"+chuanyunSelfCostDO.getProjectId());
                 matchers.add("F0000009_2,"+ChuanYunConstant.IN_PROCESS);
                 matchers.add("F0000002_2,"+chuanyunSelfCostDO.getUserId());
+                matchers.add("F0000008_2,"+chuanyunSelfCostDO.getProjectType());
                 matchers.add("F0000004_2,"+chuanyunSelfCostDO.getDayLogDate());
                 var filter= Filter.instance(0,1,true,"And",matchers);
                 try {
@@ -236,7 +245,9 @@ public class WorkHourStatistics {
 
             ChuanyunSelfCostDO chuanyunSelfCostDO = new ChuanyunSelfCostDO();
             chuanyunSelfCostDO.setStatus(projectMonth.getStatus());
-            chuanyunSelfCostDO.setMonthlyTotalHour(monthHour.getStandardWorkHour());
+            if (monthHour!=null){
+                chuanyunSelfCostDO.setMonthlyTotalHour(monthHour.getStandardWorkHour());
+            }
             chuanyunSelfCostDO.setProjectId(projectMonth.getProjectId());
             chuanyunSelfCostDO.setProjectType(projectMonth.getProjectType());
             chuanyunSelfCostDO.setUserId(projectMonth.getUserId());
@@ -245,6 +256,7 @@ public class WorkHourStatistics {
             chuanyunSelfCostDO.setDepartmentId(chuanyunUserCompanyDO.getDepartmentId());
             ChuanyunSelfCostDO oldSelfDO = chuanyunSelfCostDao.getOldSelfDO(chuanyunSelfCostDO.getUserId(),
                     chuanyunSelfCostDO.getProjectId(),
+                    chuanyunSelfCostDO.getProjectType(),
                     df.format(chuanyunSelfCostDO.getDayLogDate()),
                     projectMonth.getStatus());
             if (oldSelfDO !=null) {
@@ -405,6 +417,7 @@ public class WorkHourStatistics {
                         matchers.add("F0000003_2,"+chuanyunSelfCostDO.getProjectId());
                         matchers.add("F0000009_2,"+chuanyunSelfCostDO.getStatus());
                         matchers.add("F0000002_2,"+chuanyunSelfCostDO.getUserId());
+                        matchers.add("F0000008_2,"+chuanyunSelfCostDO.getProjectType());
                         matchers.add("F0000004_2,"+chuanyunSelfCostDO.getDayLogDate());
                         var filter= Filter.instance(0,1,true,"And",matchers);
                         var chuanyunFindAllResponse=chuanYunManager.findAll(ChuanyunMemberMonthCostDO.SCHEMA_CODE,filter);
@@ -436,12 +449,28 @@ public class WorkHourStatistics {
     /**
      * 删除状态为审核中数据
      * @param schemaCode
-     * @param buttonCode
+     * @param
      */
-    public void deleteExamineStatus(String schemaCode,String buttonCode) {
+    public void deleteExamineStatus(String schemaCode,String statusCode,String projectCode,String projectId,String userCode,String userId,String yearCode,String year,String monthCode,String month,String weekCode,String week,String typeCode,String projectType) {
         try {
             List<String> matchers = new ArrayList<>();
-            matchers.add(buttonCode+"_2,"+"2");
+            matchers.add(statusCode+"_2,"+"2");
+            matchers.add(projectCode+"_2,"+projectId);
+            if (!StringUtils.isEmpty(userId)){
+                matchers.add(userCode+"_2,"+userId);
+            }
+            if (!StringUtils.isEmpty(year)){
+                matchers.add(yearCode+"_2,"+year);
+            }
+            if (!StringUtils.isEmpty(month)){
+                matchers.add(monthCode+"_2,"+month);
+            }
+            if (!StringUtils.isEmpty(week)){
+                matchers.add(weekCode+"_2,"+week);
+            }
+            if (!StringUtils.isEmpty(projectType)){
+                matchers.add(typeCode+"_2,"+projectType);
+            }
             var filter= Filter.instance(0,Integer.MAX_VALUE,true,"And",matchers);
             var chuanyunFindAllResponse=chuanYunManager.findAll(schemaCode,filter);
             if (chuanyunFindAllResponse.getReturnData()!=null){
@@ -449,7 +478,7 @@ public class WorkHourStatistics {
                 result.forEach(basicDO -> {
                     ChuanyunSaveDTO chuanyunSaveDTO = chuanYunManager.delete(schemaCode,basicDO.getObjectId());
                     if(chuanyunSaveDTO.getSuccessful()){
-                        log.info("删除状态为审核中数据成功");
+//                        log.info("删除状态为审核中数据成功");
                     }else{
                         log.warn("删除状态为审核中数据失败");
                     }

src/main/java/com/galaxis/manatee/util/ExcelUtils.java

@@ -0,0 +1,344 @@
+package com.galaxis.manatee.util;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.galaxis.manatee.entity.chuanyun.dto.ExcelColumn;
+import org.apache.commons.collections.CollectionUtils;
+
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.CharUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+
+
+
+public class ExcelUtils {
+
+    private final static Logger log = LoggerFactory.getLogger(ExcelUtils.class);
+
+    private final static String EXCEL2003 = "xls";
+    private final static String EXCEL2007 = "xlsx";
+
+    public static <T> List<T> readExcel(String path, Class<T> cls,MultipartFile file){
+
+        String fileName = file.getOriginalFilename();
+        if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+            log.error("上传文件格式不正确");
+        }
+        List<T> dataList = new ArrayList<>();
+        Workbook workbook = null;
+        try {
+            InputStream is = file.getInputStream();
+            if (fileName.endsWith(EXCEL2007)) {
+//                FileInputStream is = new FileInputStream(new File(path));
+                workbook = new XSSFWorkbook(is);
+            }
+            if (fileName.endsWith(EXCEL2003)) {
+//                FileInputStream is = new FileInputStream(new File(path));
+                workbook = new HSSFWorkbook(is);
+            }
+            if (workbook != null) {
+                //类映射  注解 value-->bean columns
+                Map<String, List<Field>> classMap = new HashMap<>();
+                List<Field> fields = Stream.of(cls.getDeclaredFields()).collect(Collectors.toList());
+                fields.forEach(
+                        field -> {
+                            ExcelColumn annotation = field.getAnnotation(ExcelColumn.class);
+                            if (annotation != null) {
+                                String value = annotation.value();
+                                if (StringUtils.isBlank(value)) {
+                                    return;//return起到的作用和continue是相同的 语法
+                                }
+                                if (!classMap.containsKey(value)) {
+                                    classMap.put(value, new ArrayList<>());
+                                }
+                                field.setAccessible(true);
+                                classMap.get(value).add(field);
+                            }
+                        }
+                );
+                //索引-->columns
+                Map<Integer, List<Field>> reflectionMap = new HashMap<>(16);
+                //默认读取第一个sheet
+                Sheet sheet = workbook.getSheetAt(0);
+
+                boolean firstRow = true;
+                for (int i = sheet.getFirstRowNum(); i <= sheet.getLastRowNum(); i++) {
+                    Row row = sheet.getRow(i);
+                    //首行  提取注解
+                    if (firstRow) {
+                        for (int j = row.getFirstCellNum(); j <= row.getLastCellNum(); j++) {
+                            Cell cell = row.getCell(j);
+                            String cellValue = getCellValue(cell);
+                            if (classMap.containsKey(cellValue)) {
+                                reflectionMap.put(j, classMap.get(cellValue));
+                            }
+                        }
+                        firstRow = false;
+                    } else {
+                        //忽略空白行
+                        if (row == null) {
+                            continue;
+                        }
+                        try {
+                            T t = cls.newInstance();
+                            //判断是否为空白行
+                            boolean allBlank = true;
+                            for (int j = row.getFirstCellNum(); j <= row.getLastCellNum(); j++) {
+                                if (reflectionMap.containsKey(j)) {
+                                    Cell cell = row.getCell(j);
+                                    String cellValue = getCellValue(cell);
+                                    if (StringUtils.isNotBlank(cellValue)) {
+                                        allBlank = false;
+                                    }
+                                    List<Field> fieldList = reflectionMap.get(j);
+                                    fieldList.forEach(
+                                            x -> {
+                                                try {
+                                                    handleField(t, cellValue, x);
+                                                } catch (Exception e) {
+                                                    log.error(String.format("reflect field:%s value:%s exception!", x.getName(), cellValue), e);
+                                                }
+                                            }
+                                    );
+                                }
+                            }
+                            if (!allBlank) {
+                                dataList.add(t);
+                            } else {
+                                log.warn(String.format("row:%s is blank ignore!", i));
+                            }
+                        } catch (Exception e) {
+                            log.error(String.format("parse row:%s exception!", i), e);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error(String.format("parse excel exception!"), e);
+        } finally {
+            if (workbook != null) {
+                try {
+                    workbook.close();
+                } catch (Exception e) {
+                    log.error(String.format("parse excel exception!"), e);
+                }
+            }
+        }
+        return dataList;
+    }
+
+    private static <T> void handleField(T t, String value, Field field) throws Exception {
+        Class<?> type = field.getType();
+        if (type == null || type == void.class || StringUtils.isBlank(value)) {
+            return;
+        }
+        if (type == Object.class) {
+            field.set(t, value);
+            //数字类型
+        } else if (type.getSuperclass() == null || type.getSuperclass() == Number.class) {
+            if (type == int.class || type == Integer.class) {
+                field.set(t, NumberUtils.toInt(value));
+            } else if (type == long.class || type == Long.class) {
+                field.set(t, NumberUtils.toLong(value));
+            } else if (type == byte.class || type == Byte.class) {
+                field.set(t, NumberUtils.toByte(value));
+            } else if (type == short.class || type == Short.class) {
+                field.set(t, NumberUtils.toShort(value));
+            } else if (type == double.class || type == Double.class) {
+                field.set(t, NumberUtils.toDouble(value));
+            } else if (type == float.class || type == Float.class) {
+                field.set(t, NumberUtils.toFloat(value));
+            } else if (type == char.class || type == Character.class) {
+                field.set(t, CharUtils.toChar(value));
+            } else if (type == boolean.class) {
+                field.set(t, BooleanUtils.toBoolean(value));
+            } else if (type == BigDecimal.class) {
+                field.set(t, new BigDecimal(value));
+            }
+        } else if (type == Boolean.class) {
+            field.set(t, BooleanUtils.toBoolean(value));
+        } else if (type == Date.class) {
+            //
+            field.set(t, value);
+        } else if (type == String.class) {
+            field.set(t, value);
+        } else {
+            Constructor<?> constructor = type.getConstructor(String.class);
+            field.set(t, constructor.newInstance(value));
+        }
+    }
+
+    private static String getCellValue(Cell cell) {
+        if (cell == null) {
+            return "";
+        }
+        if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC) {
+            if (HSSFDateUtil.isCellDateFormatted(cell)) {
+                return HSSFDateUtil.getJavaDate(cell.getNumericCellValue()).toString();
+            } else {
+                return new BigDecimal(cell.getNumericCellValue()).toString();
+            }
+        } else if (cell.getCellType() == Cell.CELL_TYPE_STRING) {
+            return StringUtils.trimToEmpty(cell.getStringCellValue());
+        } else if (cell.getCellType() == Cell.CELL_TYPE_FORMULA) {
+            return StringUtils.trimToEmpty(cell.getCellFormula());
+        } else if (cell.getCellType() == Cell.CELL_TYPE_BLANK) {
+            return "";
+        } else if (cell.getCellType() == Cell.CELL_TYPE_BOOLEAN) {
+            return String.valueOf(cell.getBooleanCellValue());
+        } else if (cell.getCellType() == Cell.CELL_TYPE_ERROR) {
+            return "ERROR";
+        } else {
+            return cell.toString().trim();
+        }
+
+    }
+
+    public static <T> void writeExcel(HttpServletResponse response, List<T> dataList, Class<T> cls){
+        Field[] fields = cls.getDeclaredFields();
+        List<Field> fieldList = Arrays.stream(fields)
+                .filter(field -> {
+                    ExcelColumn annotation = field.getAnnotation(ExcelColumn.class);
+                    if (annotation != null && annotation.col() > 0) {
+                        field.setAccessible(true);
+                        return true;
+                    }
+                    return false;
+                }).sorted(Comparator.comparing(field -> {
+                    int col = 0;
+                    ExcelColumn annotation = field.getAnnotation(ExcelColumn.class);
+                    if (annotation != null) {
+                        col = annotation.col();
+                    }
+                    return col;
+                })).collect(Collectors.toList());
+
+        Workbook wb = new XSSFWorkbook();
+        Sheet sheet = wb.createSheet("Sheet1");
+        AtomicInteger ai = new AtomicInteger();
+        {
+            Row row = sheet.createRow(ai.getAndIncrement());
+            AtomicInteger aj = new AtomicInteger();
+            //写入头部
+            fieldList.forEach(field -> {
+                ExcelColumn annotation = field.getAnnotation(ExcelColumn.class);
+                String columnName = "";
+                if (annotation != null) {
+                    columnName = annotation.value();
+                }
+                Cell cell = row.createCell(aj.getAndIncrement());
+
+                CellStyle cellStyle = wb.createCellStyle();
+                cellStyle.setFillForegroundColor(IndexedColors.WHITE.getIndex());
+                cellStyle.setFillPattern(CellStyle.SOLID_FOREGROUND);
+                cellStyle.setAlignment(CellStyle.ALIGN_CENTER);
+
+                Font font = wb.createFont();
+                font.setBoldweight(Font.BOLDWEIGHT_NORMAL);
+                cellStyle.setFont(font);
+                cell.setCellStyle(cellStyle);
+                cell.setCellValue(columnName);
+            });
+        }
+        if (CollectionUtils.isNotEmpty(dataList)) {
+            dataList.forEach(t -> {
+                Row row1 = sheet.createRow(ai.getAndIncrement());
+                AtomicInteger aj = new AtomicInteger();
+                fieldList.forEach(field -> {
+                    Class<?> type = field.getType();
+                    Object value = "";
+                    try {
+                        value = field.get(t);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    Cell cell = row1.createCell(aj.getAndIncrement());
+                    if (value != null) {
+                        if (type == Date.class) {
+                            cell.setCellValue(value.toString());
+                        } else {
+                            cell.setCellValue(value.toString());
+                        }
+                        cell.setCellValue(value.toString());
+                    }
+                });
+            });
+        }
+        //冻结窗格
+        wb.getSheet("Sheet1").createFreezePane(0, 1, 0, 1);
+        //浏览器下载excel
+        buildExcelDocument("abbot.xlsx",wb,response);
+        //生成excel文件
+//        buildExcelFile(".\\default.xlsx",wb);
+    }
+
+    /**
+     * 浏览器下载excel
+     * @param fileName
+     * @param wb
+     * @param response
+     */
+
+    private static  void  buildExcelDocument(String fileName, Workbook wb,HttpServletResponse response){
+        try {
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            response.setHeader("Content-Disposition", "attachment;filename="+URLEncoder.encode(fileName, "utf-8"));
+            response.flushBuffer();
+            wb.write(response.getOutputStream());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 生成excel文件
+     * @param path 生成excel路径
+     * @param wb
+     */
+    private static  void  buildExcelFile(String path, Workbook wb){
+
+        File file = new File(path);
+        if (file.exists()) {
+            file.delete();
+        }
+        try {
+            wb.write(new FileOutputStream(file));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}