Browse Source

流程申请款年判断

wanxl 1 year ago
parent
commit
21989597dd

+ 4 - 0
src/main/java/com/template/controller/ApplicationProcedureTemporaryController.java

@@ -14,6 +14,7 @@ import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.ApplicationProcedureTemporaryVo;
 import com.template.model.vo.ApplicationProcedureTemporaryVo;
 import com.template.services.*;
 import com.template.services.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;
@@ -37,6 +38,7 @@ import java.util.stream.Collectors;
  * @since 2024-03-05
  * @since 2024-03-05
  */
  */
 @RestController
 @RestController
+@Slf4j
 //加密
 //加密
 //@DESRespondSecret
 //@DESRespondSecret
 public class ApplicationProcedureTemporaryController implements ApplicationProcedureTemporaryControllerAPI {
 public class ApplicationProcedureTemporaryController implements ApplicationProcedureTemporaryControllerAPI {
@@ -64,6 +66,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
 
 
     @Override
     @Override
     public CommonResult save(ApplicationProcedureTemporaryDto applicationProcedureDto) {
     public CommonResult save(ApplicationProcedureTemporaryDto applicationProcedureDto) {
+        log.info("入参"+applicationProcedureDto.toString());
         if (ObjectUtils.isEmpty(applicationProcedureDto)) {
         if (ObjectUtils.isEmpty(applicationProcedureDto)) {
             return CommonResult.fail();
             return CommonResult.fail();
         }
         }
@@ -479,6 +482,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         calendar.setTime(TimeExchange.StringToDate(strDate1,"yyyy-MM-dd"));
         calendar.setTime(TimeExchange.StringToDate(strDate1,"yyyy-MM-dd"));
         int year = calendar.get(Calendar.YEAR);
         int year = calendar.get(Calendar.YEAR);
         int week = calendar.get(Calendar.WEEK_OF_YEAR);
         int week = calendar.get(Calendar.WEEK_OF_YEAR);
+        week=week==1?53:week;
         int day = calendar.get(Calendar.DAY_OF_WEEK)-1;
         int day = calendar.get(Calendar.DAY_OF_WEEK)-1;
         if (day==0){
         if (day==0){
             day=7;
             day=7;