1.新增人员项目周度工时汇总

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

@@ -0,0 +1,30 @@
+package com.galaxis.manatee.dao;
+
+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.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ChuanyunWeekMemberHourDao extends GalaxisRepository<ChuanyunWeekMemberHourDO,String> {
+
+    /**
+     * 人员-项目-周度工时汇总
+     * @return
+     */
+    @Query(value="SELECT chuanyun_self_work_hour.object_id,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 !='' GROUP BY chuanyun_self_work_hour.project_id,chuanyun_self_work_hour.user_id,WEEKOFYEAR(chuanyun_self_work_hour.day_log_date)",nativeQuery = true)
+    List<ChuanyunWeekMemberHourDO> getWeekMemberHour();
+
+    /**
+     * 项目人员周度是否存在
+     * @param projectId
+     * @param userId
+     * @param week
+     * @return
+     */
+    ChuanyunWeekMemberHourDO findByProjectIdAndUserIdAndWeek(String projectId,String userId,String week);
+}

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

@@ -0,0 +1,58 @@
+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;
+import java.math.BigDecimal;
+
+@Slf4j
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Entity
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ChuanyunProjectMemberWeekHourDO extends BasicDO{
+    /**
+     * 表名
+     */
+    public static final String SCHEMA_CODE ="D001789acd16549a4954038915e0cf60ad81552";
+
+    /**
+     * 项目ID
+     */
+    @JsonProperty("F0000001")
+    private String projectId;
+
+    /**
+     * 用户ID
+     */
+    @JsonProperty("F0000002")
+    private String userId;
+
+    /**
+     * 项目类型
+     */
+    @JsonProperty("F0000003")
+    private String projectType;
+
+    /**
+     * 总工时
+     */
+    @JsonProperty("F0000004")
+    private BigDecimal totalHour;
+
+    /**
+     * 总人天
+     */
+    @JsonProperty("F0000005")
+    private BigDecimal personDays;
+
+    /**
+     * 周数
+     */
+    @JsonProperty("F0000006")
+    private String week;
+}

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

@@ -0,0 +1,40 @@
+package com.galaxis.manatee.entity.chuanyun.data.object;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.math.BigDecimal;
+
+@Slf4j
+@Data
+@Entity(name = "CHUANYUN_WEEK_MEMBER_HOUR")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ChuanyunWeekMemberHourDO {
+
+    @Id
+    @GeneratedValue(generator = "idGeneratorUser")
+    @GenericGenerator(name ="idGeneratorUser" ,strategy="com.galaxis.capsule.util.GalaxisIdGenerator")
+    private Long objectId;
+
+    private String userId;
+
+    private String projectType;
+
+    private String projectId;
+
+    /**
+     * 流程状态
+     */
+    private String status;
+
+    private String week;
+
+    private BigDecimal standardWorkHour;
+
+}

src/main/java/com/galaxis/manatee/webservice/CountryEndpoint.java

@@ -77,7 +77,7 @@ public class CountryEndpoint {
 		chuanyunBasicDataScheduledTask.getGroupProjectForSynchronizationManually();
 		log.info("数据同步成功");
 		ChuanyunWebServiceDTO chuanyunWebServiceDTO = new ChuanyunWebServiceDTO();
-		chuanyunWebServiceDTO.setMessage("后台数据开始更新，预计数据更新时间10分钟，请稍后查看");
+		chuanyunWebServiceDTO.setMessage("数据同步完成");
 		chuanyunWebServiceDTO.setResultCode("0");
 		invokeResponse.setResponse(objectMapper.writeValueAsString(chuanyunWebServiceDTO));
 		return invokeResponse;