From df62988da54d44526b0ea768b64a6e176c00e737 Mon Sep 17 00:00:00 2001 From: lige <bestlige@outlook.com> Date: 星期一, 04 十二月 2023 14:52:31 +0800 Subject: [PATCH] 111 --- ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjBigPositiveMapper.java | 65 +++++++++ ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjBigPositiveServiceImpl.java | 93 +++++++++++++ ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 2 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjBigPositiveController.java | 92 +++++++++++++ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOtherCheckController.java | 17 ++ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTeamContactLogController.java | 6 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjBigPositiveService.java | 63 +++++++++ ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBigPositive.java | 81 +++++++++++ 8 files changed, 412 insertions(+), 7 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java index da53400..2b3c520 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java @@ -880,7 +880,7 @@ wq.ne("type", 2); List<TjOrderRemark> list = remarkService.list(wq); if (list.size() == 0) { - return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒"); + return AjaxResult.success("璇ョ瀹や笅鏃犻」鐩紒"); } for (TjOrderRemark tjOrderRemark : list) { TjProject tjProject = projectService.getById(tjOrderRemark.getProId()); diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjBigPositiveController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjBigPositiveController.java new file mode 100644 index 0000000..a549a1a --- /dev/null +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjBigPositiveController.java @@ -0,0 +1,92 @@ +package com.ltkj.web.controller.system; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +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.TjBigPositive; +import com.ltkj.hosp.service.ITjBigPositiveService; +import com.ltkj.common.utils.poi.ExcelUtil; +import com.ltkj.common.core.page.TableDataInfo; + +/** + * 閲嶅ぇ闃虫�ц褰旵ontroller + * + * @author ltkj_璧典匠璞�&鏉庢牸 + * @date 2023-12-04 + */ +@RestController +@RequestMapping("/hosp/bigPositive") +public class TjBigPositiveController extends BaseController { + @Autowired + private ITjBigPositiveService tjBigPositiveService; + + /** + * 鏌ヨ閲嶅ぇ闃虫�ц褰曞垪琛� + */ + @GetMapping("/list") + public TableDataInfo list(TjBigPositive tjBigPositive) { + startPage(); + List<TjBigPositive> list = tjBigPositiveService.selectTjBigPositiveList(tjBigPositive); + return getDataTable(list); + } + + /** + * 瀵煎嚭閲嶅ぇ闃虫�ц褰曞垪琛� + */ + @Log(title = "閲嶅ぇ闃虫�ц褰�", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, TjBigPositive tjBigPositive) { + List<TjBigPositive> list = tjBigPositiveService.selectTjBigPositiveList(tjBigPositive); + ExcelUtil<TjBigPositive> util = new ExcelUtil<TjBigPositive>(TjBigPositive.class); + util.exportExcel(response, list, "閲嶅ぇ闃虫�ц褰曟暟鎹�"); + } + + /** + * 鑾峰彇閲嶅ぇ闃虫�ц褰曡缁嗕俊鎭� + */ + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(tjBigPositiveService.selectTjBigPositiveById(id)); + } + + /** + * 鏂板閲嶅ぇ闃虫�ц褰� + */ + @Log(title = "閲嶅ぇ闃虫�ц褰�", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TjBigPositive tjBigPositive) { + return toAjax(tjBigPositiveService.insertTjBigPositive(tjBigPositive)); + } + + /** + * 淇敼閲嶅ぇ闃虫�ц褰� + */ + @Log(title = "閲嶅ぇ闃虫�ц褰�", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TjBigPositive tjBigPositive) { + return toAjax(tjBigPositiveService.updateTjBigPositive(tjBigPositive)); + } + + /** + * 鍒犻櫎閲嶅ぇ闃虫�ц褰� + */ + @Log(title = "閲嶅ぇ闃虫�ц褰�", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(tjBigPositiveService.deleteTjBigPositiveByIds(ids)); + } +} diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOtherCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOtherCheckController.java index 22176b4..55d7b64 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOtherCheckController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOtherCheckController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ltkj.common.core.domain.model.LoginUser; import com.ltkj.common.core.redis.RedisCache; import com.ltkj.framework.config.MatchUtils; import com.ltkj.hosp.domain.TjCustomer; @@ -18,6 +19,7 @@ import com.ltkj.hosp.service.ITjOtherCheckService; import com.ltkj.hosp.service.ITjProjectService; import com.ltkj.hosp.service.TjAsyncService; +import com.ltkj.system.domain.SysLogininfor; import com.ltkj.system.service.ISysConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -154,4 +156,19 @@ public AjaxResult remove(@PathVariable String[] ids) { return toAjax(tjOtherCheckService.deleteTjOtherCheckByIds(ids)); } + + + /** + * 鏌ュ浘鏂囧垪琛� + */ + @GetMapping("/getPhotoList") + @ApiOperation(value = "鏌ュ浘鏂囧垪琛�") + public AjaxResult getPhotoList(String tjNumber,String proId) { + LambdaQueryWrapper<TjOtherCheck> wq=new LambdaQueryWrapper<>(); + wq.eq(TjOtherCheck::getTjNum,tjNumber); + wq.eq(TjOtherCheck::getProId,proId); + wq.orderByDesc(TjOtherCheck::getCreateTime); + List<TjOtherCheck> list = tjOtherCheckService.list(wq); + return AjaxResult.success(list); + } } diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTeamContactLogController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTeamContactLogController.java index 31cd5b8..b64feea 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTeamContactLogController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTeamContactLogController.java @@ -37,7 +37,6 @@ /** * 鏌ヨ鍥㈤槦棰勭害娌熼�氳褰曞垪琛� */ - @PreAuthorize("@ss.hasPermi('hosp:TjTeamContactLog:list')") @GetMapping("/list") public TableDataInfo list(TjTeamContactLog tjTeamContactLog) { startPage(); @@ -48,7 +47,6 @@ /** * 瀵煎嚭鍥㈤槦棰勭害娌熼�氳褰曞垪琛� */ - @PreAuthorize("@ss.hasPermi('hosp:TjTeamContactLog:export')") @Log(title = "鍥㈤槦棰勭害娌熼�氳褰�", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TjTeamContactLog tjTeamContactLog) { @@ -60,7 +58,6 @@ /** * 鑾峰彇鍥㈤槦棰勭害娌熼�氳褰曡缁嗕俊鎭� */ - @PreAuthorize("@ss.hasPermi('hosp:TjTeamContactLog:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { return success(tjTeamContactLogService.selectTjTeamContactLogById(id)); @@ -69,7 +66,6 @@ /** * 鏂板鍥㈤槦棰勭害娌熼�氳褰� */ - @PreAuthorize("@ss.hasPermi('hosp:TjTeamContactLog:add')") @Log(title = "鍥㈤槦棰勭害娌熼�氳褰�", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody TjTeamContactLog tjTeamContactLog) { @@ -79,7 +75,6 @@ /** * 淇敼鍥㈤槦棰勭害娌熼�氳褰� */ - @PreAuthorize("@ss.hasPermi('hosp:TjTeamContactLog:edit')") @Log(title = "鍥㈤槦棰勭害娌熼�氳褰�", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody TjTeamContactLog tjTeamContactLog) { @@ -89,7 +84,6 @@ /** * 鍒犻櫎鍥㈤槦棰勭害娌熼�氳褰� */ - @PreAuthorize("@ss.hasPermi('hosp:TjTeamContactLog:remove')") @Log(title = "鍥㈤槦棰勭害娌熼�氳褰�", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBigPositive.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBigPositive.java new file mode 100644 index 0000000..798d0e3 --- /dev/null +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBigPositive.java @@ -0,0 +1,81 @@ +package com.ltkj.hosp.domain; + +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 com.ltkj.common.annotation.Excel; +import com.ltkj.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 閲嶅ぇ闃虫�ц褰曞璞� tj_big_positive + * + * @author ltkj_璧典匠璞�&鏉庢牸 + * @date 2023-12-04 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TjBigPositive extends BaseEntity { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 浣撴鍙� + */ + @Excel(name = "浣撴鍙�") + private String tjNumber; + + /** + * 瀹㈡埛id + */ + @Excel(name = "瀹㈡埛id") + private Long cusId; + + /** + * 瀹㈡埛鍚� + */ + @Excel(name = "瀹㈡埛鍚�") + private String cusName; + + /** + * 椤圭洰鐖堕」 + */ + @Excel(name = "椤圭洰鐖堕」") + private Long proParentId; + + /** + * 椤圭洰瀛愰」 + */ + @Excel(name = "椤圭洰瀛愰」") + private Long proId; + + /** + * 椤圭洰鍚� + */ + @Excel(name = "椤圭洰鍚�") + private String proName; + + /** + * 鍙栨秷/娣诲姞鏍囧織 + */ + @Excel(name = "鍙栨秷/娣诲姞鏍囧織") + private String flag; + + /** + * 绛夌骇 + */ + @Excel(name = "绛夌骇") + private String level; + + +} diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjBigPositiveMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjBigPositiveMapper.java new file mode 100644 index 0000000..759308e --- /dev/null +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjBigPositiveMapper.java @@ -0,0 +1,65 @@ +package com.ltkj.hosp.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ltkj.hosp.domain.TjAskMedicalHistory; +import com.ltkj.hosp.domain.TjBigPositive; +import org.apache.ibatis.annotations.Mapper; + +/** + * 閲嶅ぇ闃虫�ц褰昅apper鎺ュ彛 + * + * @author ltkj_璧典匠璞�&鏉庢牸 + * @date 2023-12-04 + */ +@Mapper +public interface TjBigPositiveMapper extends BaseMapper<TjBigPositive> { + /** + * 鏌ヨ閲嶅ぇ闃虫�ц褰� + * + * @param id 閲嶅ぇ闃虫�ц褰曚富閿� + * @return 閲嶅ぇ闃虫�ц褰� + */ + public TjBigPositive selectTjBigPositiveById(Long id); + + /** + * 鏌ヨ閲嶅ぇ闃虫�ц褰曞垪琛� + * + * @param tjBigPositive 閲嶅ぇ闃虫�ц褰� + * @return 閲嶅ぇ闃虫�ц褰曢泦鍚� + */ + public List<TjBigPositive> selectTjBigPositiveList(TjBigPositive tjBigPositive); + + /** + * 鏂板閲嶅ぇ闃虫�ц褰� + * + * @param tjBigPositive 閲嶅ぇ闃虫�ц褰� + * @return 缁撴灉 + */ + public int insertTjBigPositive(TjBigPositive tjBigPositive); + + /** + * 淇敼閲嶅ぇ闃虫�ц褰� + * + * @param tjBigPositive 閲嶅ぇ闃虫�ц褰� + * @return 缁撴灉 + */ + public int updateTjBigPositive(TjBigPositive tjBigPositive); + + /** + * 鍒犻櫎閲嶅ぇ闃虫�ц褰� + * + * @param id 閲嶅ぇ闃虫�ц褰曚富閿� + * @return 缁撴灉 + */ + public int deleteTjBigPositiveById(Long id); + + /** + * 鎵归噺鍒犻櫎閲嶅ぇ闃虫�ц褰� + * + * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteTjBigPositiveByIds(Long[] ids); +} diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjBigPositiveService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjBigPositiveService.java new file mode 100644 index 0000000..de9af9f --- /dev/null +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjBigPositiveService.java @@ -0,0 +1,63 @@ +package com.ltkj.hosp.service; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ltkj.hosp.domain.TjAskMedicalHistory; +import com.ltkj.hosp.domain.TjBigPositive; + +/** + * 閲嶅ぇ闃虫�ц褰昐ervice鎺ュ彛 + * + * @author ltkj_璧典匠璞�&鏉庢牸 + * @date 2023-12-04 + */ +public interface ITjBigPositiveService extends IService<TjBigPositive> { + /** + * 鏌ヨ閲嶅ぇ闃虫�ц褰� + * + * @param id 閲嶅ぇ闃虫�ц褰曚富閿� + * @return 閲嶅ぇ闃虫�ц褰� + */ + public TjBigPositive selectTjBigPositiveById(Long id); + + /** + * 鏌ヨ閲嶅ぇ闃虫�ц褰曞垪琛� + * + * @param tjBigPositive 閲嶅ぇ闃虫�ц褰� + * @return 閲嶅ぇ闃虫�ц褰曢泦鍚� + */ + public List<TjBigPositive> selectTjBigPositiveList(TjBigPositive tjBigPositive); + + /** + * 鏂板閲嶅ぇ闃虫�ц褰� + * + * @param tjBigPositive 閲嶅ぇ闃虫�ц褰� + * @return 缁撴灉 + */ + public int insertTjBigPositive(TjBigPositive tjBigPositive); + + /** + * 淇敼閲嶅ぇ闃虫�ц褰� + * + * @param tjBigPositive 閲嶅ぇ闃虫�ц褰� + * @return 缁撴灉 + */ + public int updateTjBigPositive(TjBigPositive tjBigPositive); + + /** + * 鎵归噺鍒犻櫎閲嶅ぇ闃虫�ц褰� + * + * @param ids 闇�瑕佸垹闄ょ殑閲嶅ぇ闃虫�ц褰曚富閿泦鍚� + * @return 缁撴灉 + */ + public int deleteTjBigPositiveByIds(Long[] ids); + + /** + * 鍒犻櫎閲嶅ぇ闃虫�ц褰曚俊鎭� + * + * @param id 閲嶅ぇ闃虫�ц褰曚富閿� + * @return 缁撴灉 + */ + public int deleteTjBigPositiveById(Long id); +} diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjBigPositiveServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjBigPositiveServiceImpl.java new file mode 100644 index 0000000..83ba451 --- /dev/null +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjBigPositiveServiceImpl.java @@ -0,0 +1,93 @@ +package com.ltkj.hosp.service.impl; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ltkj.common.utils.DateUtils; +import com.ltkj.hosp.domain.TjCatering; +import com.ltkj.hosp.mapper.TjCateringMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ltkj.hosp.mapper.TjBigPositiveMapper; +import com.ltkj.hosp.domain.TjBigPositive; +import com.ltkj.hosp.service.ITjBigPositiveService; + +/** + * 閲嶅ぇ闃虫�ц褰昐ervice涓氬姟灞傚鐞� + * + * @author ltkj_璧典匠璞�&鏉庢牸 + * @date 2023-12-04 + */ +@Service +public class TjBigPositiveServiceImpl extends ServiceImpl<TjBigPositiveMapper, TjBigPositive> implements ITjBigPositiveService { + @Autowired + private TjBigPositiveMapper tjBigPositiveMapper; + + /** + * 鏌ヨ閲嶅ぇ闃虫�ц褰� + * + * @param id 閲嶅ぇ闃虫�ц褰曚富閿� + * @return 閲嶅ぇ闃虫�ц褰� + */ + @Override + public TjBigPositive selectTjBigPositiveById(Long id) { + return tjBigPositiveMapper.selectTjBigPositiveById(id); + } + + /** + * 鏌ヨ閲嶅ぇ闃虫�ц褰曞垪琛� + * + * @param tjBigPositive 閲嶅ぇ闃虫�ц褰� + * @return 閲嶅ぇ闃虫�ц褰� + */ + @Override + public List<TjBigPositive> selectTjBigPositiveList(TjBigPositive tjBigPositive) { + return tjBigPositiveMapper.selectTjBigPositiveList(tjBigPositive); + } + + /** + * 鏂板閲嶅ぇ闃虫�ц褰� + * + * @param tjBigPositive 閲嶅ぇ闃虫�ц褰� + * @return 缁撴灉 + */ + @Override + public int insertTjBigPositive(TjBigPositive tjBigPositive) { + tjBigPositive.setCreateTime(DateUtils.getNowDate()); + return tjBigPositiveMapper.insertTjBigPositive(tjBigPositive); + } + + /** + * 淇敼閲嶅ぇ闃虫�ц褰� + * + * @param tjBigPositive 閲嶅ぇ闃虫�ц褰� + * @return 缁撴灉 + */ + @Override + public int updateTjBigPositive(TjBigPositive tjBigPositive) { + tjBigPositive.setUpdateTime(DateUtils.getNowDate()); + return tjBigPositiveMapper.updateTjBigPositive(tjBigPositive); + } + + /** + * 鎵归噺鍒犻櫎閲嶅ぇ闃虫�ц褰� + * + * @param ids 闇�瑕佸垹闄ょ殑閲嶅ぇ闃虫�ц褰曚富閿� + * @return 缁撴灉 + */ + @Override + public int deleteTjBigPositiveByIds(Long[] ids) { + return tjBigPositiveMapper.deleteTjBigPositiveByIds(ids); + } + + /** + * 鍒犻櫎閲嶅ぇ闃虫�ц褰曚俊鎭� + * + * @param id 閲嶅ぇ闃虫�ц褰曚富閿� + * @return 缁撴灉 + */ + @Override + public int deleteTjBigPositiveById(Long id) { + return tjBigPositiveMapper.deleteTjBigPositiveById(id); + } +} -- Gitblit v1.8.0