完善工时统计

wisenergy-mapper/src/main/resources/mapper/WorkProjectMapper.xml

@@ -23,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, oa_project_id, project_name,business_id,business_name, type, manager_id, dept_id, work_time, cost_budget, is_conclusion,start_time,end_time, create_time, modify_time
+        id, oa_project_id, project_name,business_id,business_name, type, manager_id, dept_id, work_time, cost_budget, is_conclusion,start_time,end_time, create_time, modify_time,conclusion_time
     </sql>
 
     <sql id="table">
@@ -46,12 +46,13 @@
         <if test="endTime != null">and end_time =#{endTime}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
         <if test="modifyTime != null">and modify_time &gt;= modifyTime</if>
+        <if test="conclusionTime != null">and conclusion_time &gt;= conclusionTime</if>
     </sql>
 
     <update id="updateIsConclusionById">
         UPDATE
         <include refid="table"/>
-        SET is_conclusion = 0, modify_time = now()
+        SET is_conclusion = 0, conclusion_time = now()
         WHERE id = #{id}
     </update>
     <update id="updateProject">
@@ -225,7 +226,7 @@
                 AND manager_id = #{managerId}
             </if>
             <if test="year != null">
-                AND YEAR (create_time) &lt;= #{year} AND( (is_conclusion = 0 AND year(modify_time) >= #{year}) or (is_conclusion = 1))
+                AND YEAR (create_time) &lt;= #{year} AND( year(conclusion_time) >= #{year} or is_conclusion = 1)
             </if>
         </where>
     </select>

wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkProject.java

@@ -62,11 +62,11 @@ public class WorkProject implements Serializable {
     private Integer isConclusion;
 
     @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd")
-    @ApiModelProperty(name = "startTime",value = "项目开始时间")
+    @ApiModelProperty(name = "startTime",value = "项目预计开始时间")
     private Date startTime;
 
     @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd")
-    @ApiModelProperty(name = "endTime",value = "项目结束时间")
+    @ApiModelProperty(name = "endTime",value = "项目预计结束时间")
     private Date endTime;
 
     @ApiModelProperty(name = "createTime",value = "创建时间")
@@ -75,7 +75,6 @@ public class WorkProject implements Serializable {
     @ApiModelProperty(name = "modifyTime",value = "修改时间")
     private Date modifyTime;
 
-
-
-
+    @ApiModelProperty(name = "conclusionTime",value = "结项时间")
+    private Date conclusionTime;
 }

wisenergy-service/src/main/java/cn/wisenergy/service/impl/StatisticsServiceImpl.java

@@ -914,7 +914,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         setBorderStyle(BorderStyle.THIN, cellRangeAddress3, sheet1);
         // 项目行和总计行,正常工时和加班工时表头列数
         short lastCellNum = row_2.getLastCellNum();
-        for (int i = 0; i < lastCellNum / 2; i++) {
+        for (int i = 0; i < lastCellNum / 2-1; i++) {
             // 总计行
             CellRangeAddress cellRangeAddress4 = new CellRangeAddress(userWorkTimeStatisticsReport.size() + 2, userWorkTimeStatisticsReport.size() + 2, i * 2, i * 2 + 1);
             sheet1.addMergedRegion(cellRangeAddress4);