diff --git a/src/main/java/com/sa/zentao/conf/CodeGenerator.java b/src/main/java/com/sa/zentao/conf/CodeGenerator.java
index 8e78d96..bef123e 100644
--- a/src/main/java/com/sa/zentao/conf/CodeGenerator.java
+++ b/src/main/java/com/sa/zentao/conf/CodeGenerator.java
@@ -22,7 +22,7 @@ public class CodeGenerator {
     //自己的名字
     static String Author = "gqb";
 
-    public static String tableName = "car_driving_license";
+    public static String tableName = "zt_story_month_workload";
 
     /**
      * <p>
diff --git a/src/main/java/com/sa/zentao/entity/ZtStoryExpand.java b/src/main/java/com/sa/zentao/entity/ZtStoryExpand.java
index e581440..a10da64 100644
--- a/src/main/java/com/sa/zentao/entity/ZtStoryExpand.java
+++ b/src/main/java/com/sa/zentao/entity/ZtStoryExpand.java
@@ -100,5 +100,19 @@ public class ZtStoryExpand implements Serializable {
     @TableField(exist = false)
     private BigDecimal monthEvaluationTime;
 
+    /**
+     * 产品人员
+     */
+    private String productPerson;
+
+    /**
+     * 开发人员
+     */
+    private String developPerson;
+
+    /**
+     * 测试人员
+     */
+    private String testPerson;
 
 }
diff --git a/src/main/java/com/sa/zentao/service/impl/IZtCountService.java b/src/main/java/com/sa/zentao/service/impl/IZtCountService.java
index 00fe526..72847ad 100644
--- a/src/main/java/com/sa/zentao/service/impl/IZtCountService.java
+++ b/src/main/java/com/sa/zentao/service/impl/IZtCountService.java
@@ -2522,7 +2522,7 @@ public class IZtCountService {
 
             }
         }
-        BigDecimal taskManageRate = BigDecimalUtils.isZero(allocationTime) ? BigDecimal.ZERO :allocationTime .divide(examineTime, 2, BigDecimal.ROUND_HALF_UP);
+        BigDecimal taskManageRate = BigDecimalUtils.isZero(allocationTime)||BigDecimalUtils.isZero(examineTime) ? BigDecimal.ZERO :allocationTime .divide(examineTime, 2, BigDecimal.ROUND_HALF_UP);
         result.setAllocationTime(allocationTime);
         result.setExamineTime(examineTime);
 
diff --git a/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java
index 47a3427..834879d 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java
@@ -1023,6 +1023,7 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
         ztTask.setDeliverContent(dto.getDeliverContent());
         ztTask.setLasteditedby(RiskUserThreadLocal.get().getName());
         ztTask.setLastediteddate(new Date());
+        ztTask.setFeedbackRemark(dto.getFeedbackRemark());
         this.baseMapper.updateById(ztTask);
 
         ZtEffortDTO e = new ZtEffortDTO();
diff --git a/src/main/resources/mapper/ZtBugMapper.xml b/src/main/resources/mapper/ZtBugMapper.xml
index d7f221c..20472d7 100644
--- a/src/main/resources/mapper/ZtBugMapper.xml
+++ b/src/main/resources/mapper/ZtBugMapper.xml
@@ -816,7 +816,7 @@
         from zt_bug s
         LEFT JOIN zt_bug_bind_user u on  s.id = u.bug_id
 
-        WHERE 1= 1  and u.assigned_to = #{account}
+        WHERE 1= 1  and (u.assigned_to = #{account}  )
 
         <if test="pIds != null and pIds.size() > 0">
             and s.product in
diff --git a/src/main/resources/mapper/ZtStoryExpandMapper.xml b/src/main/resources/mapper/ZtStoryExpandMapper.xml
index bf8a544..d651de7 100644
--- a/src/main/resources/mapper/ZtStoryExpandMapper.xml
+++ b/src/main/resources/mapper/ZtStoryExpandMapper.xml
@@ -19,6 +19,9 @@
             <result column="story_title" property="storyTitle" />
             <result column="create_user_nickname" property="createUserNickname" />
             <result column="month_evaluation_time" property="monthEvaluationTime" />
+            <result column="product_person" property="productPerson" />
+            <result column="develop_person" property="developPerson" />
+            <result column="test_person" property="testPerson" />
     </resultMap>
 
     <select id="queryByMonthWithTitle" resultMap="BaseResultMap">