1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Report.java

@@ -161,7 +161,7 @@ public class Report extends Model<Report> {
     /**
      * 阶段/岗位/工序
      */
-    @TableField(value = "stage",updateStrategy = FieldStrategy.IGNORED)
+    @TableField(value = "stage")
     private String stage;
 
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ReportMapper.java

@@ -222,4 +222,6 @@ public interface ReportMapper extends BaseMapper<Report> {
     List<Map<String, Object>> getReportListWithTransfer(Integer companyId, String startDate, String endDate,@Param("list") List<String> userIdList, Integer projectId, Integer start, Integer size);
 
     Integer getReportListWithTransferCount(Integer companyId, String startDate, String endDate,@Param("list") List<String> userIdList, Integer projectId);
+
+    void batchUpdateReportStageToNull(List<Integer> list);
 }

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

@@ -9685,6 +9685,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 transferReportList.add(report);
             }
             if(transferReportList.size()>0){
+                if(stagesName==null){
+                    List<Integer> list = transferReportList.stream().map(Report::getId).collect(Collectors.toList());
+                    reportMapper.batchUpdateReportStageToNull(list);
+                }
                 if(!reportService.updateBatchById(transferReportList)){
                     msg.setError("验证失败");
                 }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -1338,4 +1338,11 @@
         </if>
         ) as total
     </select>
+
+    <update id="batchUpdateReportStageToNull">
+        update report set stage=null where id in 
+        <foreach collection="list" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+    </update>
 </mapper>