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