Merge remote-tracking branch 'origin/test-merge' into test-merge

blade-service/blade-business/src/main/java/org/springblade/business/controller/ContractLogController.java

@@ -28,6 +28,7 @@ import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.oss.model.BladeFile;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -396,8 +397,8 @@ public class ContractLogController extends BladeController {
     @PostMapping("/getSubmitLogDateList")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "获取合同段当前日志节点下的填报日期记录")
-    public R<List<String>> getSubmitLogDateList(@RequestParam String contractId, @RequestParam String primaryKeyId, @RequestParam String year) {
-        return R.data(this.contractLogService.getSubmitLogDateList(contractId, primaryKeyId, year));
+    public R<List<String>> getSubmitLogDateList(@RequestParam String contractId, @RequestParam String primaryKeyId, @RequestParam String year, BladeUser user) {
+        return R.data(this.contractLogService.getSubmitLogDateList(contractId, primaryKeyId, year, user.getUserId()+""));
     }
 
     /**

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ContractLogMapper.java

@@ -34,7 +34,7 @@ public interface ContractLogMapper extends BaseMapper<ContractLog> {
 
     List<String> queryReportLogTimeTree(@Param("contractId") String contractId, @Param("nodePrimaryKeyId") String nodePrimaryKeyId);
 
-    List<String> getSubmitLogDateList(@Param("contractId") String contractId, @Param("primaryKeyId") String primaryKeyId, @Param("year") String year);
+    List<String> getSubmitLogDateList(@Param("contractId") String contractId, @Param("primaryKeyId") String primaryKeyId, @Param("year") String year,@Param("userId") String userId);
 
     List<ContractLog> queryFillUser(@Param("vo") ContractLogVO vo);
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ContractLogMapper.xml

@@ -72,8 +72,8 @@
         from u_contract_log
         where is_deleted = 0
           and wbs_node_id = #{primaryKeyId}
-          and contract_id =
-              #{contractId}
+          and contract_id = #{contractId}
+          and create_user = #{userId}
           and record_time like concat('%', #{year}, '%')
         group by record_time
         order by record_time DESC

blade-service/blade-business/src/main/java/org/springblade/business/service/IContractLogService.java

@@ -38,7 +38,7 @@ public interface IContractLogService extends BaseService<ContractLog> {
 
     List<FileUserVO> queryFillUser(ContractLogVO logVO);
 
-    List<String> getSubmitLogDateList(String contractId, String primaryKeyId, String year);
+    List<String> getSubmitLogDateList(String contractId, String primaryKeyId, String year,String userId);
 
     /**
      * 施工日志分页

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ContractLogServiceImpl.java

@@ -95,8 +95,8 @@ public class ContractLogServiceImpl extends BaseServiceImpl<ContractLogMapper, C
     }
 
     @Override
-    public List<String> getSubmitLogDateList(String contractId, String primaryKeyId, String year) {
-        return this.baseMapper.getSubmitLogDateList(contractId, primaryKeyId, year);
+    public List<String> getSubmitLogDateList(String contractId, String primaryKeyId, String year,String userId) {
+        return this.baseMapper.getSubmitLogDateList(contractId, primaryKeyId, year,userId);
     }
 
     @Override

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -3231,6 +3231,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
                         if ((tabVal.contains("BG-") || tabVal.contains("JL-")) && Func.isNotEmpty(contractInfo.getIsTestRecord()) && contractInfo.getIsTestRecord()==1) {
                             //重新生成自己的编号，不引用旧编号
+
                             continue;
                         }
                         // 时间段处理
@@ -3341,13 +3342,13 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 }
             }
         }
-        if(reData1.size()>0){
+        /*if(reData1.size()>0){
             for (Map.Entry<String, Object> entry : reData1.entrySet()) {
                 if(reData.containsKey(entry.getKey())){
                     reData.put(entry.getKey(), entry.getValue());
                 }
             }
-        }
+        }*/
         list.add(reData);
         return list;
     }