Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgResumeInfoController.java

@@ -51,8 +51,8 @@ public class JgResumeInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/saveBatchResume")
 	@ApiOperation(httpMethod = "POST", value = "批量新增", notes = "批量新增")
-	public boolean saveBatchResume(@RequestBody List<JgResumeInfoDto> jgResumeInfoDtoList) {
-		return jgResumeInfoServiceImpl.saveBatchResume(jgResumeInfoDtoList);
+	public void saveBatchResume(@RequestBody List<JgResumeInfoDto> jgResumeInfoDtoList) {
+		jgResumeInfoServiceImpl.saveBatchResume(jgResumeInfoDtoList);
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgResumeInfoServiceImpl.java

@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgResumeInfoMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgResumeInfoService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import java.util.Collection;
 import java.util.List;
@@ -35,8 +34,7 @@ public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto,JgResum
         return this.queryForList("" , false);
     }
 
-    @Transactional
-    public boolean saveBatchResume(List<JgResumeInfoDto> jgResumeInfoDtoList) {
+    public void saveBatchResume(List<JgResumeInfoDto> jgResumeInfoDtoList) {
         Collection<JgResumeInfo> jgResumeInfoCollection = jgResumeInfoDtoList.stream()
                 .map(dto -> {
                     JgResumeInfo info = new JgResumeInfo();
@@ -44,6 +42,6 @@ public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto,JgResum
                     return info;
                 })
                 .collect(Collectors.toList());
-        return this.saveBatch(jgResumeInfoCollection);
+         this.saveBatch(jgResumeInfoCollection);
     }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/utils/WordTemplateUtils.java

@@ -230,7 +230,7 @@ public class WordTemplateUtils {
     /**
      * 下载填充模板的字段，特殊符号转义
      */
-    private static Map<String, Object> escapeSpecialCharacters(Map<String, ?> inputMap) {
+    public static Map<String, Object> escapeSpecialCharacters(Map<String, ?> inputMap) {
         Map<String, Object> escapedMap = new HashMap<>();
         for (Map.Entry<String, ?> entry : inputMap.entrySet()) {
             String key = entry.getKey();

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/feign/JgFeignClient.java

@@ -24,6 +24,6 @@ public interface JgFeignClient {
      * 设备注册信息分页查询
      * */
     @RequestMapping(value = "/jg-resume-info/saveBatchResume", method = RequestMethod.POST)
-    FeignClientResult<Boolean> saveBatchResume(@RequestBody List<JgResumeInfoDto> jgResumeInfoDtoList);
+    FeignClientResult saveBatchResume(@RequestBody List<JgResumeInfoDto> jgResumeInfoDtoList);
 }