diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 23a3ee5d..201afee6 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -26,6 +26,7 @@ import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.Print; +import com.lz.modules.sys.entity.Resource; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultComment; import com.lz.modules.sys.entity.app.ResultDetail; @@ -50,6 +51,8 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.function.Consumer; import java.util.function.Function; @@ -123,6 +126,9 @@ public class ResultRecordController extends AbstractController { @Autowired private ResourceService resourceService; + private final static String TYPE = "H5_URL"; + private final static String SEC_TYPE = "RECORD"; + /** * 列表 */ @@ -1260,20 +1266,23 @@ public class ResultRecordController extends AbstractController { if(CollectionUtils.isEmpty(reqs)){ return R.error("添加数据为空"); } - String time = LocalDate.now().toString(); + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); + String time = dtf.format(now); List prints = Lists.newArrayList(); int i =1; + Resource resource = resourceService.selectResourceByTypeAndSecType(TYPE, SEC_TYPE); for(RecordDetailExplanReq recordDetailExplanReq:reqs){ Print print = new Print(); BeanUtils.copyProperties(recordDetailExplanReq,print); print.setBatchNo(time + "_" + recordDetailExplanReq.getRecordId() + "_" + i++); - print.setUrl(""); + Optional.ofNullable(resource).ifPresent(resource1 -> print.setUrl(resource1.getValue())); prints.add(print); } - /*if(!printService.saveBatch(prints)){ + if(!printService.saveBatch(prints)){ return R.error("保存失败"); - }*/ + } return R.ok(); } diff --git a/src/main/java/com/lz/modules/sys/dao/ResourceMapper.java b/src/main/java/com/lz/modules/sys/dao/ResourceMapper.java index 9d5451c0..e55ec87d 100644 --- a/src/main/java/com/lz/modules/sys/dao/ResourceMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/ResourceMapper.java @@ -22,5 +22,6 @@ public interface ResourceMapper extends BaseMapper { int deleteResourceById(@Param("id") Long id); + Resource selectResourceByTypeAndSecType(@Param("type") String Type, @Param("secType") String secType); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/ResourceService.java b/src/main/java/com/lz/modules/sys/service/ResourceService.java index 3659c714..4255805d 100644 --- a/src/main/java/com/lz/modules/sys/service/ResourceService.java +++ b/src/main/java/com/lz/modules/sys/service/ResourceService.java @@ -21,5 +21,7 @@ public interface ResourceService extends IService { int deleteResourceById(Long id); + Resource selectResourceByTypeAndSecType(String type,String secType); + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/impl/ResourceServiceImpl.java b/src/main/java/com/lz/modules/sys/service/impl/ResourceServiceImpl.java index 2142a80d..5ea65d47 100644 --- a/src/main/java/com/lz/modules/sys/service/impl/ResourceServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/impl/ResourceServiceImpl.java @@ -49,6 +49,8 @@ public class ResourceServiceImpl extends ServiceImpl i return resourceMapper.deleteResourceById(id); } - - + @Override + public Resource selectResourceByTypeAndSecType(String type, String secType) { + return resourceMapper.selectResourceByTypeAndSecType(type,secType); + } } diff --git a/src/main/resources/mapper/sys/ResourceMapper.xml b/src/main/resources/mapper/sys/ResourceMapper.xml index eb1f3c28..ca5f7e5c 100644 --- a/src/main/resources/mapper/sys/ResourceMapper.xml +++ b/src/main/resources/mapper/sys/ResourceMapper.xml @@ -38,6 +38,11 @@ + + + insert into lz_resource( creator,