jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit ceaa88f8c1c4335a4e2fbbfa727e9288dc43604a

Authored by jiangjiazhi
2 parents d12ac03f6d 2ab9041397
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java View file @ ceaa88f
... ... @@ -26,5 +26,6 @@
26 26 public BasicConfig getOneBasicConfigById(String id);
27 27  
28 28 public void batchSave(Collection<BasicConfig> list);
  29 +
29 30 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java View file @ ceaa88f
... ... @@ -29,9 +29,8 @@
29 29 }
30 30  
31 31 public void batchSave(Collection<BasicConfig> list) {
32   - batchSave(list);
  32 + super.batchSave(list);
33 33 }
34   -
35 34  
36 35 public BasicConfig getBasicConfig(String id) {
37 36 return findById(id);
platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java View file @ ceaa88f
... ... @@ -14,6 +14,7 @@
14 14 import javax.servlet.http.HttpServletResponse;
15 15 import java.io.File;
16 16 import java.io.IOException;
  17 +import java.util.ArrayList;
17 18 import java.util.HashMap;
18 19 import java.util.List;
19 20 import java.util.Map;
20 21  
21 22  
22 23  
23 24  
... ... @@ -80,13 +81,17 @@
80 81 }
81 82 List<BasicConfig> configList = basicConfigService.queryBasicConfig(new BasicConfigQuery());
82 83 BasicConfig u = new BasicConfig();
  84 + u.setEnable(1);
  85 + u.setYn(1);
83 86 for (BasicConfig config:configList) {
  87 + u.setId(config.getId());
84 88 String code = codeMap.get(config.getName());
85 89 if (StringUtils.isNotBlank(code)) {
86   - u.setId(config.getId());
87 90 u.setCode(code);
88   - basicConfigService.updateBasicConfig(u);
  91 + } else {
  92 + u.setCode(null);
89 93 }
  94 + basicConfigService.updateBasicConfig(u);
90 95 }
91 96 } catch (IOException e) {
92 97 e.printStackTrace();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ ceaa88f
... ... @@ -29,7 +29,7 @@
29 29 * Created by zhang.rui on 2015/9/28 0028.
30 30 */
31 31 @Controller
32   -public class OrganizationController extends RestController {
  32 +public class OrganizationController extends BaseController {
33 33 @Autowired
34 34 private UsersService usersService;
35 35 @Autowired