From 3a1c9430768830a931c86c03bf08c98ac6435d4a Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 26 六月 2024 10:32:40 +0800
Subject: [PATCH] zjh 本地 2024/06/26 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java | 162 +++++++++++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjZhxmMapper.java | 12 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxmglpro.java | 27 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjZhxmglproService.java | 10 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjZhxmServiceImpl.java | 14 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjZhxmglproServiceImpl.java | 14 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjZhxmglproMapper.java | 12 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjZhxmService.java | 10 +
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java | 39 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 4
10 files changed, 302 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 0c31ca5..df5f223 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -567,7 +567,7 @@
return AjaxResult.success(tjCustomer);
}
}
- return null;
+ return AjaxResult.error(object.getStr("ResultContent"));
}
/**
@@ -622,7 +622,7 @@
// hisApiGetMethodService.save(object, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
return AjaxResult.success();
}
- return AjaxResult.error();
+ return AjaxResult.error(object.getStr("ResultContent"));
}
return AjaxResult.success();
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
new file mode 100644
index 0000000..b028682
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
@@ -0,0 +1,162 @@
+package com.ltkj.web.controller.system;/*
+ * @浣滆�� zjh
+ * @鏃堕棿 2024-06-26 9:44
+ * */
+
+import cn.hutool.extra.pinyin.PinyinUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.common.annotation.Log;
+import com.ltkj.common.core.controller.BaseController;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.enums.BusinessType;
+import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.dto.QianDaoDto;
+import com.ltkj.hosp.service.ITjProjectService;
+import com.ltkj.hosp.service.TjZhxmService;
+import com.ltkj.hosp.service.TjZhxmglproService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@RestController
+@RequestMapping("/system/zhxm")
+@Api(tags = "PC绔粍鍚堥」鐩浉鍏虫帴鍙�")
+@Slf4j
+public class TjZhxmController extends BaseController {
+
+ @Autowired
+ private TjZhxmglproService tjZhxmglproService;
+ @Autowired
+ private TjZhxmService zhxmService;
+ @Resource
+ private ITjProjectService tjProjectService;
+
+ @Log(title = "浣撴缁勫悎椤圭洰", businessType = BusinessType.INSERT)
+ @PostMapping
+ @ApiOperation(value = "鏂板浣撴缁勫悎")
+ @Transactional
+ public AjaxResult add(@RequestBody @ApiParam(value = "浣撴缁勫悎瀵硅薄") TjZhxm zhxm) {
+ LambdaQueryWrapper<TjZhxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjZhxm::getZhmc, zhxm.getZhmc());
+ TjZhxm one = zhxmService.getOne(wq);
+ if (null != one) {
+ return AjaxResult.error("璇ョ粍鍚堝凡瀛樺湪,涓嶅彲閲嶅娣诲姞!");
+ }
+ zhxm.setPym(PinyinUtil.getFirstLetter(zhxm.getZhmc(), ""));
+ if (zhxmService.save(zhxm)) {
+ List<TjZhxmglpro> zhxmglpros = zhxm.getZhxmglpros();
+ if (null != zhxmglpros && zhxmglpros.size() > 0) {
+ for (TjZhxmglpro zhxmglpro : zhxmglpros) {
+ TjZhxmglpro pro = new TjZhxmglpro();
+ pro.setZhId(zhxm.getId());
+ pro.setProId(zhxmglpro.getProId());
+ tjZhxmglproService.save(pro);
+ }
+ }
+ return AjaxResult.success();
+ }
+ return AjaxResult.error("鏂板澶辫触");
+ }
+
+ /**
+ * 淇敼浣撴缁勫悎
+ */
+ @Log(title = "浣撴缁勫悎", businessType = BusinessType.UPDATE)
+ @PutMapping
+ @ApiOperation(value = "淇敼浣撴缁勫悎")
+ @Transactional
+ public AjaxResult edit(@RequestBody @ApiParam(value = "浣撴缁勫悎瀵硅薄") TjZhxm zhxm) {
+ zhxm.setPym(PinyinUtil.getFirstLetter(zhxm.getZhmc(), ""));
+ if (zhxmService.updateById(zhxm)) {
+ List<TjZhxmglpro> zhxmglpros = zhxm.getZhxmglpros();
+ if (null != zhxmglpros && zhxmglpros.size() > 0) {
+ LambdaQueryWrapper<TjZhxmglpro> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjZhxmglpro::getZhId, zhxm.getId());
+ tjZhxmglproService.remove(wq);
+ for (TjZhxmglpro zhxmglpro : zhxmglpros) {
+ TjZhxmglpro pro = new TjZhxmglpro();
+ pro.setZhId(zhxm.getId());
+ pro.setProId(zhxmglpro.getProId());
+ tjZhxmglproService.save(pro);
+ }
+ }
+
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
+
+
+ @GetMapping("/listByZhId")
+ @ApiOperation(value = "鏍规嵁缁勫悎id鑾峰彇浣撴缁勫悎璇︾粏淇℃伅")
+ public AjaxResult listByZhId(@ApiParam(value = "浣撴缁勫悎id") @RequestParam Long zhId) {
+ if (zhId != null) {
+ TjZhxm zhxm = zhxmService.getById(zhId);
+ if (null != zhxm) {
+ LambdaQueryWrapper<TjZhxmglpro> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjZhxmglpro::getZhId, zhxm.getId());
+ List<TjZhxmglpro> list = tjZhxmglproService.list(wq);
+ StringBuilder allName = new StringBuilder();
+// StringBuilder allSonName = new StringBuilder();
+ if (null != list && list.size() > 0) {
+ List<TjProject> projectList = new ArrayList<>();
+ for (TjZhxmglpro zhxmglpro : list) {
+ LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjProject::getProId, zhxmglpro.getProId());
+ wq1.eq(TjProject::getProParentId, 0);
+ if (null != tjProjectService.getOne(wq1)) {
+ projectList.add(tjProjectService.getOne(wq1));
+ allName.append(tjProjectService.getOne(wq1).getProName()).append("锛�");
+ }
+ }
+ zhxm.setAllProName(allName.toString());
+// for (TjProject tjProject : projectList) {
+// LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
+// wq2.eq(TjProject::getProParentId, tjProject.getProId());
+// tjProject.setTjProjectList(tjProjectService.list(wq2));
+// for (TjProject project : tjProjectService.list(wq2)) {
+// allSonName.append(project.getProName()).append("锛�");
+// }
+// tjProject.setAllSonProName(allSonName.toString());
+// }
+ zhxm.setZhxmglpros(list);
+
+ return AjaxResult.success(zhxm);
+ }
+ }
+ return success("鏆傛椂娌℃湁鏁版嵁");
+ }
+ return error("缁勫悎ID涓嶈兘涓虹┖");
+ }
+
+
+ @DeleteMapping("/{zhIds}")
+ @ApiOperation(value = "鍒犻櫎浣撴缁勫悎")
+ public AjaxResult remove(@PathVariable Long[] zhIds) {
+ if (null != zhIds && zhIds.length > 0) {
+ for (Long zhId : zhIds) {
+ TjZhxm byId = zhxmService.getById(zhId);
+ if (zhxmService.removeById(byId)) {
+ LambdaQueryWrapper<TjZhxmglpro> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjZhxmglpro::getZhId,zhId);
+ tjZhxmglproService.remove(wq);
+ }
+ }
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
+ }
+ return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑缁勫悎");
+ }
+
+
+}
+
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java
new file mode 100644
index 0000000..4e5dcbc
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java
@@ -0,0 +1,39 @@
+package com.ltkj.hosp.domain;/*
+ * @浣滆�� zjh
+ * @鏃堕棿 2024-06-26 9:06
+ * */
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ltkj.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TjZhxm extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "涓婚敭id")
+ @TableId(type = IdType.AUTO)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ private String zhmc;
+ private String pym;
+ private Integer xh;
+
+ @TableField(exist = false)
+ private List<TjZhxmglpro> zhxmglpros;
+
+ @ApiModelProperty(value = "缁勫悎涓墍鏈夊瓙椤圭洰闆嗗悎")
+ @TableField(exist = false)
+ private String allSonName;
+
+ @ApiModelProperty(value = "鐖堕」鐩悕绉板瓧绗︿覆")
+ @TableField(exist = false)
+ private String allProName;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxmglpro.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxmglpro.java
new file mode 100644
index 0000000..1576afa
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxmglpro.java
@@ -0,0 +1,27 @@
+package com.ltkj.hosp.domain;/*
+ * @浣滆�� zjh
+ * @鏃堕棿 2024-06-26 9:30
+ * */
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TjZhxmglpro implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "涓婚敭id")
+ @TableId(type = IdType.AUTO)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long zhId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long proId;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjZhxmMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjZhxmMapper.java
new file mode 100644
index 0000000..8966943
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjZhxmMapper.java
@@ -0,0 +1,12 @@
+package com.ltkj.hosp.mapper;/*
+ * @浣滆�� zjh
+ * @鏃堕棿 2024-06-26 9:35
+ * */
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjZhxm;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TjZhxmMapper extends BaseMapper<TjZhxm> {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjZhxmglproMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjZhxmglproMapper.java
new file mode 100644
index 0000000..7efbf00
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjZhxmglproMapper.java
@@ -0,0 +1,12 @@
+package com.ltkj.hosp.mapper;/*
+ * @浣滆�� zjh
+ * @鏃堕棿 2024-06-26 9:38
+ * */
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjZhxmglpro;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TjZhxmglproMapper extends BaseMapper<TjZhxmglpro> {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjZhxmService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjZhxmService.java
new file mode 100644
index 0000000..caeeb80
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjZhxmService.java
@@ -0,0 +1,10 @@
+package com.ltkj.hosp.service;/*
+ * @浣滆�� zjh
+ * @鏃堕棿 2024-06-26 9:36
+ * */
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjZhxm;
+
+public interface TjZhxmService extends IService<TjZhxm> {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjZhxmglproService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjZhxmglproService.java
new file mode 100644
index 0000000..3cc68de
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjZhxmglproService.java
@@ -0,0 +1,10 @@
+package com.ltkj.hosp.service;/*
+ * @浣滆�� zjh
+ * @鏃堕棿 2024-06-26 9:38
+ * */
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjZhxmglpro;
+
+public interface TjZhxmglproService extends IService<TjZhxmglpro> {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjZhxmServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjZhxmServiceImpl.java
new file mode 100644
index 0000000..baf6fa9
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjZhxmServiceImpl.java
@@ -0,0 +1,14 @@
+package com.ltkj.hosp.service.impl;/*
+ * @浣滆�� zjh
+ * @鏃堕棿 2024-06-26 9:36
+ * */
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjZhxm;
+import com.ltkj.hosp.mapper.TjZhxmMapper;
+import com.ltkj.hosp.service.TjZhxmService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TjZhxmServiceImpl extends ServiceImpl<TjZhxmMapper, TjZhxm> implements TjZhxmService {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjZhxmglproServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjZhxmglproServiceImpl.java
new file mode 100644
index 0000000..407fc85
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjZhxmglproServiceImpl.java
@@ -0,0 +1,14 @@
+package com.ltkj.hosp.service.impl;/*
+ * @浣滆�� zjh
+ * @鏃堕棿 2024-06-26 9:39
+ * */
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjZhxmglpro;
+import com.ltkj.hosp.mapper.TjZhxmglproMapper;
+import com.ltkj.hosp.service.TjZhxmglproService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TjZhxmglproServiceImpl extends ServiceImpl<TjZhxmglproMapper, TjZhxmglpro> implements TjZhxmglproService {
+}
--
Gitblit v1.8.0