Browse Source

生成器展示剩余模块

ry
loser 1 year ago
parent
commit
9edfcfb712
  1. 14
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/NucleicController.java
  2. 4
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/VaccineController.java
  3. 0
      ruoyi-admin/src/main/resources/templates/check/checkManage/add.html
  4. 0
      ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html
  5. 0
      ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html
  6. 0
      ruoyi-admin/src/main/resources/templates/individual/check/add.html
  7. 0
      ruoyi-admin/src/main/resources/templates/individual/check/check.html
  8. 0
      ruoyi-admin/src/main/resources/templates/individual/check/edit.html
  9. 6
      ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html
  10. 6
      ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html
  11. 8
      ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html
  12. 8
      ruoyi-admin/src/main/resources/templates/supplies/nucleic/add.html
  13. 10
      ruoyi-admin/src/main/resources/templates/supplies/nucleic/edit.html
  14. 32
      ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic.html
  15. 2
      ruoyi-admin/src/main/resources/templates/supplies/vaccine/add.html
  16. 2
      ruoyi-admin/src/main/resources/templates/supplies/vaccine/edit.html
  17. 14
      ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine.html
  18. 48
      ruoyi-system/src/main/java/com/ruoyi/system/domain/Nucleic.java
  19. 24
      ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientManage.java
  20. 12
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/NucleicMapper.java
  21. 12
      ruoyi-system/src/main/java/com/ruoyi/system/service/INucleicService.java
  22. 18
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NucleicServiceImpl.java
  23. 22
      ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml
  24. 67
      ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml
  25. 0
      ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml
  26. 67
      ruoyi-system/src/main/resources/mapper/suppliesManage/NucleicMapper.xml

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/NucleicController.java

@ -22,14 +22,14 @@ import com.ruoyi.common.core.page.TableDataInfo;
/** /**
* 核酸管理Controller * 核酸管理Controller
* *
* @author ruoyi * @author zlx
* @date 2023-04-22 * @date 2023-04-22
*/ */
@Controller @Controller
@RequestMapping("/supplies/nucleic") @RequestMapping("/supplies/nucleic")
public class NucleicController extends BaseController public class NucleicController extends BaseController
{ {
private String prefix = "supplies/nucleic"; private String prefix = "supplies/nucleic/nucleic";
@Autowired @Autowired
private INucleicService nucleicService; private INucleicService nucleicService;
@ -38,7 +38,7 @@ public class NucleicController extends BaseController
@GetMapping() @GetMapping()
public String nucleic() public String nucleic()
{ {
return prefix + "/nucleic"; return prefix ;
} }
/** /**
@ -93,10 +93,10 @@ public class NucleicController extends BaseController
* 修改核酸管理 * 修改核酸管理
*/ */
@RequiresPermissions("supplies:nucleic:edit") @RequiresPermissions("supplies:nucleic:edit")
@GetMapping("/edit/{nucleinId}") @GetMapping("/edit/{nucleicId}")
public String edit(@PathVariable("nucleinId") Long nucleinId, ModelMap mmap) public String edit(@PathVariable("nucleicId") Long nucleicId, ModelMap mmap)
{ {
Nucleic nucleic = nucleicService.selectNucleicByNucleinId(nucleinId); Nucleic nucleic = nucleicService.selectNucleicByNucleicId(nucleicId);
mmap.put("nucleic", nucleic); mmap.put("nucleic", nucleic);
return prefix + "/edit"; return prefix + "/edit";
} }
@ -122,6 +122,6 @@ public class NucleicController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult remove(String ids) public AjaxResult remove(String ids)
{ {
return toAjax(nucleicService.deleteNucleicByNucleinIds(ids)); return toAjax(nucleicService.deleteNucleicByNucleicIds(ids));
} }
} }

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/VaccineController.java

@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequestMapping("/supplies/vaccine") @RequestMapping("/supplies/vaccine")
public class VaccineController extends BaseController public class VaccineController extends BaseController
{ {
private String prefix = "supplies/vaccine"; private String prefix = "supplies/vaccine/vaccine";
@Autowired @Autowired
private IVaccineService vaccineService; private IVaccineService vaccineService;
@ -38,7 +38,7 @@ public class VaccineController extends BaseController
@GetMapping() @GetMapping()
public String vaccine() public String vaccine()
{ {
return prefix + "/vaccine"; return prefix ;
} }
/** /**

0
ruoyi-admin/src/main/resources/templates/checkManage/add.html → ruoyi-admin/src/main/resources/templates/check/checkManage/add.html

0
ruoyi-admin/src/main/resources/templates/checkManage/checkManage.html → ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html

0
ruoyi-admin/src/main/resources/templates/checkManage/edit.html → ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html

0
ruoyi-admin/src/main/resources/templates/check/add.html → ruoyi-admin/src/main/resources/templates/individual/check/add.html

0
ruoyi-admin/src/main/resources/templates/check/check.html → ruoyi-admin/src/main/resources/templates/individual/check/check.html

0
ruoyi-admin/src/main/resources/templates/check/edit.html → ruoyi-admin/src/main/resources/templates/individual/check/edit.html

6
ruoyi-admin/src/main/resources/templates/patientManage/add.html → ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html

@ -34,7 +34,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">最近感染地区:</label> <label class="col-sm-3 control-label">最近感染地区:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="currenPostition" class="form-control" type="text"> <input name="currentPosition" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -47,7 +47,7 @@
<label class="col-sm-3 control-label">感染时间:</label> <label class="col-sm-3 control-label">感染时间:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <div class="input-group date">
<input name="diagonosedTime" class="form-control" placeholder="yyyy-MM-dd" type="text"> <input name="diagnosedTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
@ -92,7 +92,7 @@
} }
} }
$("input[name='diagonosedTime']").datetimepicker({ $("input[name='diagnosedTime']").datetimepicker({
format: "yyyy-mm-dd", format: "yyyy-mm-dd",
minView: "month", minView: "month",
autoclose: true autoclose: true

6
ruoyi-admin/src/main/resources/templates/patientManage/edit.html → ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html

@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">最近感染地区:</label> <label class="col-sm-3 control-label">最近感染地区:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="currenPostition" th:field="*{currenPostition}" class="form-control" type="text"> <input name="currentPosition" th:field="*{currentPosition}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -48,7 +48,7 @@
<label class="col-sm-3 control-label">感染时间:</label> <label class="col-sm-3 control-label">感染时间:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <div class="input-group date">
<input name="diagonosedTime" th:value="${#dates.format(patientManage.diagonosedTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> <input name="diagnosedTime" th:value="${#dates.format(patientManage.diagnosedTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
@ -93,7 +93,7 @@
} }
} }
$("input[name='diagonosedTime']").datetimepicker({ $("input[name='diagnosedTime']").datetimepicker({
format: "yyyy-mm-dd", format: "yyyy-mm-dd",
minView: "month", minView: "month",
autoclose: true autoclose: true

8
ruoyi-admin/src/main/resources/templates/patientManage/patientManage.html → ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html

@ -28,7 +28,7 @@
</li> </li>
<li> <li>
<label>最近感染地区:</label> <label>最近感染地区:</label>
<input type="text" name="currenPostition"/> <input type="text" name="currentPosition"/>
</li> </li>
<li> <li>
<label>当天体温:</label> <label>当天体温:</label>
@ -36,7 +36,7 @@
</li> </li>
<li> <li>
<label>感染时间:</label> <label>感染时间:</label>
<input type="text" class="time-input" placeholder="请选择感染时间" name="diagonosedTime"/> <input type="text" class="time-input" placeholder="请选择感染时间" name="diagnosedTime"/>
</li> </li>
<li> <li>
<label>确诊状态:</label> <label>确诊状态:</label>
@ -125,7 +125,7 @@
title: '备注' title: '备注'
}, },
{ {
field: 'currenPostition', field: 'currentPosition',
title: '最近感染地区' title: '最近感染地区'
}, },
{ {
@ -133,7 +133,7 @@
title: '当天体温' title: '当天体温'
}, },
{ {
field: 'diagonosedTime', field: 'diagnosedTime',
title: '感染时间' title: '感染时间'
}, },
{ {

8
ruoyi-admin/src/main/resources/templates/supplies/nucleic/add.html

@ -9,26 +9,26 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">核酸名字:</label> <label class="col-sm-3 control-label">核酸名字:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="nucleinName" class="form-control" type="text"> <input name="nucleicName" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">核酸数量:</label> <label class="col-sm-3 control-label">核酸数量:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="nucleinNumber" class="form-control" type="text"> <input name="nucleicNumber" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">核酸描述:</label> <label class="col-sm-3 control-label">核酸描述:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="nucleinDescription" class="form-control" type="text"> <input name="nucleicDescription" class="form-control" type="text">
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "system/nucleic" var prefix = ctx + "supplies/nucleic"
$("#form-nucleic-add").validate({ $("#form-nucleic-add").validate({
focusCleanup: true focusCleanup: true
}); });

10
ruoyi-admin/src/main/resources/templates/supplies/nucleic/edit.html

@ -6,30 +6,30 @@
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-nucleic-edit" th:object="${nucleic}"> <form class="form-horizontal m" id="form-nucleic-edit" th:object="${nucleic}">
<input name="nucleinId" th:field="*{nucleinId}" type="hidden"> <input name="nucleicId" th:field="*{nucleicId}" type="hidden">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">核酸名字:</label> <label class="col-sm-3 control-label">核酸名字:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="nucleinName" th:field="*{nucleinName}" class="form-control" type="text"> <input name="nucleicName" th:field="*{nucleicName}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">核酸数量:</label> <label class="col-sm-3 control-label">核酸数量:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="nucleinNumber" th:field="*{nucleinNumber}" class="form-control" type="text"> <input name="nucleicNumber" th:field="*{nucleicNumber}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">核酸描述:</label> <label class="col-sm-3 control-label">核酸描述:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="nucleinDescription" th:field="*{nucleinDescription}" class="form-control" type="text"> <input name="nucleicDescription" th:field="*{nucleicDescription}" class="form-control" type="text">
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "system/nucleic"; var prefix = ctx + "supplies/nucleic";
$("#form-nucleic-edit").validate({ $("#form-nucleic-edit").validate({
focusCleanup: true focusCleanup: true
}); });

32
ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic.html

@ -12,15 +12,15 @@
<ul> <ul>
<li> <li>
<label>核酸名字:</label> <label>核酸名字:</label>
<input type="text" name="nucleinName"/> <input type="text" name="nucleicName"/>
</li> </li>
<li> <li>
<label>核酸数量:</label> <label>核酸数量:</label>
<input type="text" name="nucleinNumber"/> <input type="text" name="nucleicNumber"/>
</li> </li>
<li> <li>
<label>核酸描述:</label> <label>核酸描述:</label>
<input type="text" name="nucleinDescription"/> <input type="text" name="nucleicDescription"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -32,16 +32,16 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:nucleic:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="supplies:nucleic:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:nucleic:edit"> <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="supplies:nucleic:edit">
<i class="fa fa-edit"></i> 修改 <i class="fa fa-edit"></i> 修改
</a> </a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:nucleic:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="supplies:nucleic:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:nucleic:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="supplies:nucleic:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
@ -52,9 +52,9 @@
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:nucleic:edit')}]]; var editFlag = [[${@permission.hasPermi('supplies:nucleic:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:nucleic:remove')}]]; var removeFlag = [[${@permission.hasPermi('supplies:nucleic:remove')}]];
var prefix = ctx + "system/nucleic"; var prefix = ctx + "supplies/nucleic";
$(function() { $(function() {
var options = { var options = {
@ -68,20 +68,20 @@
checkbox: true checkbox: true
}, },
{ {
field: 'nucleinId', field: 'nucleicId',
title: '核酸ID', title: '核酸ID',
visible: false visible: false
}, },
{ {
field: 'nucleinName', field: 'nucleicName',
title: '核酸名字' title: '核酸名字'
}, },
{ {
field: 'nucleinNumber', field: 'nucleicNumber',
title: '核酸数量' title: '核酸数量'
}, },
{ {
field: 'nucleinDescription', field: 'nucleicDescription',
title: '核酸描述' title: '核酸描述'
}, },
{ {
@ -89,8 +89,8 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.nucleinId + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.nucleicId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.nucleinId + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.nucleicId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');
} }
}] }]

2
ruoyi-admin/src/main/resources/templates/supplies/vaccine/add.html

@ -28,7 +28,7 @@
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "system/vaccine" var prefix = ctx + "supplies/vaccine"
$("#form-vaccine-add").validate({ $("#form-vaccine-add").validate({
focusCleanup: true focusCleanup: true
}); });

2
ruoyi-admin/src/main/resources/templates/supplies/vaccine/edit.html

@ -29,7 +29,7 @@
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "system/vaccine"; var prefix = ctx + "supplies/vaccine";
$("#form-vaccine-edit").validate({ $("#form-vaccine-edit").validate({
focusCleanup: true focusCleanup: true
}); });

14
ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine.html

@ -32,16 +32,16 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:vaccine:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="supplies:vaccine:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:vaccine:edit"> <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="supplies:vaccine:edit">
<i class="fa fa-edit"></i> 修改 <i class="fa fa-edit"></i> 修改
</a> </a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:vaccine:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="supplies:vaccine:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:vaccine:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="supplies:vaccine:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
@ -52,9 +52,9 @@
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:vaccine:edit')}]]; var editFlag = [[${@permission.hasPermi('supplies:vaccine:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:vaccine:remove')}]]; var removeFlag = [[${@permission.hasPermi('supplies:vaccine:remove')}]];
var prefix = ctx + "system/vaccine"; var prefix = ctx + "supplies/vaccine";
$(function() { $(function() {
var options = { var options = {

48
ruoyi-system/src/main/java/com/ruoyi/system/domain/Nucleic.java

@ -16,64 +16,64 @@ public class Nucleic extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 核酸ID */ /** 核酸ID */
private Long nucleinId; private Long nucleicId;
/** 核酸名字 */ /** 核酸名字 */
@Excel(name = "核酸名字") @Excel(name = "核酸名字")
private String nucleinName; private String nucleicName;
/** 核酸数量 */ /** 核酸数量 */
@Excel(name = "核酸数量") @Excel(name = "核酸数量")
private String nucleinNumber; private String nucleicNumber;
/** 核酸描述 */ /** 核酸描述 */
@Excel(name = "核酸描述") @Excel(name = "核酸描述")
private String nucleinDescription; private String nucleicDescription;
public void setNucleinId(Long nucleinId) public void setnucleicId(Long nucleicId)
{ {
this.nucleinId = nucleinId; this.nucleicId = nucleicId;
} }
public Long getNucleinId() public Long getnucleicId()
{ {
return nucleinId; return nucleicId;
} }
public void setNucleinName(String nucleinName) public void setnucleicName(String nucleicName)
{ {
this.nucleinName = nucleinName; this.nucleicName = nucleicName;
} }
public String getNucleinName() public String getnucleicName()
{ {
return nucleinName; return nucleicName;
} }
public void setNucleinNumber(String nucleinNumber) public void setnucleicNumber(String nucleicNumber)
{ {
this.nucleinNumber = nucleinNumber; this.nucleicNumber = nucleicNumber;
} }
public String getNucleinNumber() public String getnucleicNumber()
{ {
return nucleinNumber; return nucleicNumber;
} }
public void setNucleinDescription(String nucleinDescription) public void setnucleicDescription(String nucleicDescription)
{ {
this.nucleinDescription = nucleinDescription; this.nucleicDescription = nucleicDescription;
} }
public String getNucleinDescription() public String getnucleicDescription()
{ {
return nucleinDescription; return nucleicDescription;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("nucleinId", getNucleinId()) .append("nucleicId", getnucleicId())
.append("nucleinName", getNucleinName()) .append("nucleicName", getnucleicName())
.append("nucleinNumber", getNucleinNumber()) .append("nucleicNumber", getnucleicNumber())
.append("nucleinDescription", getNucleinDescription()) .append("nucleicDescription", getnucleicDescription())
.toString(); .toString();
} }
} }

24
ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientManage.java

@ -42,7 +42,7 @@ public class PatientManage extends BaseEntity
/** 最近感染地区 */ /** 最近感染地区 */
@Excel(name = "最近感染地区") @Excel(name = "最近感染地区")
private String currenPostition; private String currentPosition;
/** 当天体温 */ /** 当天体温 */
@Excel(name = "当天体温") @Excel(name = "当天体温")
@ -51,7 +51,7 @@ public class PatientManage extends BaseEntity
/** 感染时间 */ /** 感染时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "感染时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "感染时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date diagonosedTime; private Date diagnosedTime;
/** 确诊状态 */ /** 确诊状态 */
@Excel(name = "确诊状态") @Excel(name = "确诊状态")
@ -123,14 +123,14 @@ public class PatientManage extends BaseEntity
{ {
return description; return description;
} }
public void setCurrenPostition(String currenPostition) public void setCurrentPostition(String currentPosition)
{ {
this.currenPostition = currenPostition; this.currentPosition = currentPosition;
} }
public String getCurrenPostition() public String getCurrentPostition()
{ {
return currenPostition; return currentPosition;
} }
public void setTemperature(String temperature) public void setTemperature(String temperature)
{ {
@ -141,14 +141,14 @@ public class PatientManage extends BaseEntity
{ {
return temperature; return temperature;
} }
public void setDiagonosedTime(Date diagonosedTime) public void setDiagnosedTime(Date diagnosedTime)
{ {
this.diagonosedTime = diagonosedTime; this.diagnosedTime = diagnosedTime;
} }
public Date getDiagonosedTime() public Date getDiagnosedTime()
{ {
return diagonosedTime; return diagnosedTime;
} }
public void setIsDiagnosed(Integer isDiagnosed) public void setIsDiagnosed(Integer isDiagnosed)
{ {
@ -196,9 +196,9 @@ public class PatientManage extends BaseEntity
.append("patientSex", getPatientSex()) .append("patientSex", getPatientSex())
.append("patientPhone", getPatientPhone()) .append("patientPhone", getPatientPhone())
.append("description", getDescription()) .append("description", getDescription())
.append("currenPostition", getCurrenPostition()) .append("currentPosition", getCurrentPostition())
.append("temperature", getTemperature()) .append("temperature", getTemperature())
.append("diagonosedTime", getDiagonosedTime()) .append("diagnosedTime", getDiagnosedTime())
.append("isDiagnosed", getIsDiagnosed()) .append("isDiagnosed", getIsDiagnosed())
.append("isCure", getIsCure()) .append("isCure", getIsCure())
.append("isTouch", getIsTouch()) .append("isTouch", getIsTouch())

12
ruoyi-system/src/main/java/com/ruoyi/system/mapper/NucleicMapper.java

@ -14,10 +14,10 @@ public interface NucleicMapper
/** /**
* 查询核酸管理 * 查询核酸管理
* *
* @param nucleinId 核酸管理主键 * @param nucleicId 核酸管理主键
* @return 核酸管理 * @return 核酸管理
*/ */
public Nucleic selectNucleicByNucleinId(Long nucleinId); public Nucleic selectNucleicByNucleicId(Long nucleicId);
/** /**
* 查询核酸管理列表 * 查询核酸管理列表
@ -46,16 +46,16 @@ public interface NucleicMapper
/** /**
* 删除核酸管理 * 删除核酸管理
* *
* @param nucleinId 核酸管理主键 * @param nucleicId 核酸管理主键
* @return 结果 * @return 结果
*/ */
public int deleteNucleicByNucleinId(Long nucleinId); public int deleteNucleicByNucleicId(Long nucleicId);
/** /**
* 批量删除核酸管理 * 批量删除核酸管理
* *
* @param nucleinIds 需要删除的数据主键集合 * @param nucleicIds 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteNucleicByNucleinIds(String[] nucleinIds); public int deleteNucleicByNucleicIds(String[] nucleicIds);
} }

12
ruoyi-system/src/main/java/com/ruoyi/system/service/INucleicService.java

@ -14,10 +14,10 @@ public interface INucleicService
/** /**
* 查询核酸管理 * 查询核酸管理
* *
* @param nucleinId 核酸管理主键 * @param nucleicId 核酸管理主键
* @return 核酸管理 * @return 核酸管理
*/ */
public Nucleic selectNucleicByNucleinId(Long nucleinId); public Nucleic selectNucleicByNucleicId(Long nucleicId);
/** /**
* 查询核酸管理列表 * 查询核酸管理列表
@ -46,16 +46,16 @@ public interface INucleicService
/** /**
* 批量删除核酸管理 * 批量删除核酸管理
* *
* @param nucleinIds 需要删除的核酸管理主键集合 * @param nucleicIds 需要删除的核酸管理主键集合
* @return 结果 * @return 结果
*/ */
public int deleteNucleicByNucleinIds(String nucleinIds); public int deleteNucleicByNucleicIds(String nucleicIds);
/** /**
* 删除核酸管理信息 * 删除核酸管理信息
* *
* @param nucleinId 核酸管理主键 * @param nucleicId 核酸管理主键
* @return 结果 * @return 结果
*/ */
public int deleteNucleicByNucleinId(Long nucleinId); public int deleteNucleicByNucleicId(Long nucleicId);
} }

18
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NucleicServiceImpl.java

@ -23,13 +23,13 @@ public class NucleicServiceImpl implements INucleicService
/** /**
* 查询核酸管理 * 查询核酸管理
* *
* @param nucleinId 核酸管理主键 * @param nucleicId 核酸管理主键
* @return 核酸管理 * @return 核酸管理
*/ */
@Override @Override
public Nucleic selectNucleicByNucleinId(Long nucleinId) public Nucleic selectNucleicByNucleicId(Long nucleicId)
{ {
return nucleicMapper.selectNucleicByNucleinId(nucleinId); return nucleicMapper.selectNucleicByNucleicId(nucleicId);
} }
/** /**
@ -71,24 +71,24 @@ public class NucleicServiceImpl implements INucleicService
/** /**
* 批量删除核酸管理 * 批量删除核酸管理
* *
* @param nucleinIds 需要删除的核酸管理主键 * @param nucleicIds 需要删除的核酸管理主键
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteNucleicByNucleinIds(String nucleinIds) public int deleteNucleicByNucleicIds(String nucleicIds)
{ {
return nucleicMapper.deleteNucleicByNucleinIds(Convert.toStrArray(nucleinIds)); return nucleicMapper.deleteNucleicByNucleicIds(Convert.toStrArray(nucleicIds));
} }
/** /**
* 删除核酸管理信息 * 删除核酸管理信息
* *
* @param nucleinId 核酸管理主键 * @param nucleicId 核酸管理主键
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteNucleicByNucleinId(Long nucleinId) public int deleteNucleicByNucleicId(Long nucleicId)
{ {
return nucleicMapper.deleteNucleicByNucleinId(nucleinId); return nucleicMapper.deleteNucleicByNucleicId(nucleicId);
} }
} }

22
ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml

@ -11,9 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="patientSex" column="patient_sex" /> <result property="patientSex" column="patient_sex" />
<result property="patientPhone" column="patient_phone" /> <result property="patientPhone" column="patient_phone" />
<result property="description" column="description" /> <result property="description" column="description" />
<result property="currenPostition" column="curren_postition" /> <result property="currentPosition" column="current_position" />
<result property="temperature" column="temperature" /> <result property="temperature" column="temperature" />
<result property="diagonosedTime" column="diagonosed_time" /> <result property="diagnosedTime" column="diagnosed_time" />
<result property="isDiagnosed" column="is_diagnosed" /> <result property="isDiagnosed" column="is_diagnosed" />
<result property="isCure" column="is_cure" /> <result property="isCure" column="is_cure" />
<result property="isTouch" column="is_touch" /> <result property="isTouch" column="is_touch" />
@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectPatientManageVo"> <sql id="selectPatientManageVo">
select patient_id, patient_name, patient_age, patient_sex, patient_phone, description, curren_postition, temperature, diagonosed_time, is_diagnosed, is_cure, is_touch, is_dead from patient_manage select patient_id, patient_name, patient_age, patient_sex, patient_phone, description, curren_postition, temperature, diagnosed_time, is_diagnosed, is_cure, is_touch, is_dead from patient_manage
</sql> </sql>
<select id="selectPatientManageList" parameterType="PatientManage" resultMap="PatientManageResult"> <select id="selectPatientManageList" parameterType="PatientManage" resultMap="PatientManageResult">
@ -32,9 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="patientSex != null and patientSex != ''"> and patient_sex = #{patientSex}</if> <if test="patientSex != null and patientSex != ''"> and patient_sex = #{patientSex}</if>
<if test="patientPhone != null and patientPhone != ''"> and patient_phone = #{patientPhone}</if> <if test="patientPhone != null and patientPhone != ''"> and patient_phone = #{patientPhone}</if>
<if test="description != null and description != ''"> and description = #{description}</if> <if test="description != null and description != ''"> and description = #{description}</if>
<if test="currenPostition != null and currenPostition != ''"> and curren_postition = #{currenPostition}</if> <if test="currentPosition != null and currentPosition != ''"> and curren_postition = #{currentPosition}</if>
<if test="temperature != null and temperature != ''"> and temperature = #{temperature}</if> <if test="temperature != null and temperature != ''"> and temperature = #{temperature}</if>
<if test="diagonosedTime != null "> and diagonosed_time = #{diagonosedTime}</if> <if test="diagnosedTime != null "> and diagnosed_time = #{diagnosedTime}</if>
<if test="isDiagnosed != null "> and is_diagnosed = #{isDiagnosed}</if> <if test="isDiagnosed != null "> and is_diagnosed = #{isDiagnosed}</if>
<if test="isCure != null "> and is_cure = #{isCure}</if> <if test="isCure != null "> and is_cure = #{isCure}</if>
<if test="isTouch != null "> and is_touch = #{isTouch}</if> <if test="isTouch != null "> and is_touch = #{isTouch}</if>
@ -55,9 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="patientSex != null">patient_sex,</if> <if test="patientSex != null">patient_sex,</if>
<if test="patientPhone != null">patient_phone,</if> <if test="patientPhone != null">patient_phone,</if>
<if test="description != null">description,</if> <if test="description != null">description,</if>
<if test="currenPostition != null">curren_postition,</if> <if test="currentPosition != null">curren_postition,</if>
<if test="temperature != null">temperature,</if> <if test="temperature != null">temperature,</if>
<if test="diagonosedTime != null">diagonosed_time,</if> <if test="diagnosedTime != null">diagnosed_time,</if>
<if test="isDiagnosed != null">is_diagnosed,</if> <if test="isDiagnosed != null">is_diagnosed,</if>
<if test="isCure != null">is_cure,</if> <if test="isCure != null">is_cure,</if>
<if test="isTouch != null">is_touch,</if> <if test="isTouch != null">is_touch,</if>
@ -69,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="patientSex != null">#{patientSex},</if> <if test="patientSex != null">#{patientSex},</if>
<if test="patientPhone != null">#{patientPhone},</if> <if test="patientPhone != null">#{patientPhone},</if>
<if test="description != null">#{description},</if> <if test="description != null">#{description},</if>
<if test="currenPostition != null">#{currenPostition},</if> <if test="currentPosition != null">#{currentPosition},</if>
<if test="temperature != null">#{temperature},</if> <if test="temperature != null">#{temperature},</if>
<if test="diagonosedTime != null">#{diagonosedTime},</if> <if test="diagnosedTime != null">#{diagnosedTime},</if>
<if test="isDiagnosed != null">#{isDiagnosed},</if> <if test="isDiagnosed != null">#{isDiagnosed},</if>
<if test="isCure != null">#{isCure},</if> <if test="isCure != null">#{isCure},</if>
<if test="isTouch != null">#{isTouch},</if> <if test="isTouch != null">#{isTouch},</if>
@ -87,9 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="patientSex != null">patient_sex = #{patientSex},</if> <if test="patientSex != null">patient_sex = #{patientSex},</if>
<if test="patientPhone != null">patient_phone = #{patientPhone},</if> <if test="patientPhone != null">patient_phone = #{patientPhone},</if>
<if test="description != null">description = #{description},</if> <if test="description != null">description = #{description},</if>
<if test="currenPostition != null">curren_postition = #{currenPostition},</if> <if test="currentPosition != null">curren_postition = #{currentPosition},</if>
<if test="temperature != null">temperature = #{temperature},</if> <if test="temperature != null">temperature = #{temperature},</if>
<if test="diagonosedTime != null">diagonosed_time = #{diagonosedTime},</if> <if test="diagnosedTime != null">diagnosed_time = #{diagnosedTime},</if>
<if test="isDiagnosed != null">is_diagnosed = #{isDiagnosed},</if> <if test="isDiagnosed != null">is_diagnosed = #{isDiagnosed},</if>
<if test="isCure != null">is_cure = #{isCure},</if> <if test="isCure != null">is_cure = #{isCure},</if>
<if test="isTouch != null">is_touch = #{isTouch},</if> <if test="isTouch != null">is_touch = #{isTouch},</if>

67
ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.NucleicMapper">
<resultMap type="Nucleic" id="NucleicResult">
<result property="nucleicId" column="nucleic_id" />
<result property="nucleicName" column="nucleic_name" />
<result property="nucleicNumber" column="nucleic_number" />
<result property="nucleicDescription" column="nucleic_description" />
</resultMap>
<sql id="selectNucleicVo">
select nucleic_id, nucleic_name, nucleic_number, nucleic_description from nucleic
</sql>
<select id="selectNucleicList" parameterType="Nucleic" resultMap="NucleicResult">
<include refid="selectNucleicVo"/>
<where>
<if test="nucleicName != null and nucleicName != ''"> and nucleic_name like concat('%', #{nucleicName}, '%')</if>
<if test="nucleicNumber != null and nucleicNumber != ''"> and nucleic_number = #{nucleicNumber}</if>
<if test="nucleicDescription != null and nucleicDescription != ''"> and nucleic_description = #{nucleicDescription}</if>
</where>
</select>
<select id="selectNucleicBynucleicId" parameterType="Long" resultMap="NucleicResult">
<include refid="selectNucleicVo"/>
where nucleic_id = #{nucleicId}
</select>
<insert id="insertNucleic" parameterType="Nucleic" useGeneratedKeys="true" keyProperty="nucleicId">
insert into nucleic
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="nucleicName != null">nucleic_name,</if>
<if test="nucleicNumber != null">nucleic_number,</if>
<if test="nucleicDescription != null">nucleic_description,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="nucleicName != null">#{nucleicName},</if>
<if test="nucleicNumber != null">#{nucleicNumber},</if>
<if test="nucleicDescription != null">#{nucleicDescription},</if>
</trim>
</insert>
<update id="updateNucleic" parameterType="Nucleic">
update nucleic
<trim prefix="SET" suffixOverrides=",">
<if test="nucleicName != null">nucleic_name = #{nucleicName},</if>
<if test="nucleicNumber != null">nucleic_number = #{nucleicNumber},</if>
<if test="nucleicDescription != null">nucleic_description = #{nucleicDescription},</if>
</trim>
where nucleic_id = #{nucleicId}
</update>
<delete id="deleteNucleicByNucleicId" parameterType="Long">
delete from nucleic where nucleic_id = #{nucleicId}
</delete>
<delete id="deleteNucleicByNucleicIds" parameterType="String">
delete from nucleic where nucleic_id in
<foreach item="nucleicId" collection="array" open="(" separator="," close=")">
#{nucleicId}
</foreach>
</delete>
</mapper>

0
ruoyi-system/src/main/resources/mapper/suppliesManage/VaccineMapper.xml → ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml

67
ruoyi-system/src/main/resources/mapper/suppliesManage/NucleicMapper.xml

@ -1,67 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.NucleicMapper">
<resultMap type="Nucleic" id="NucleicResult">
<result property="nucleinId" column="nuclein_id" />
<result property="nucleinName" column="nuclein_name" />
<result property="nucleinNumber" column="nuclein_number" />
<result property="nucleinDescription" column="nuclein_description" />
</resultMap>
<sql id="selectNucleicVo">
select nuclein_id, nuclein_name, nuclein_number, nuclein_description from nucleic
</sql>
<select id="selectNucleicList" parameterType="Nucleic" resultMap="NucleicResult">
<include refid="selectNucleicVo"/>
<where>
<if test="nucleinName != null and nucleinName != ''"> and nuclein_name like concat('%', #{nucleinName}, '%')</if>
<if test="nucleinNumber != null and nucleinNumber != ''"> and nuclein_number = #{nucleinNumber}</if>
<if test="nucleinDescription != null and nucleinDescription != ''"> and nuclein_description = #{nucleinDescription}</if>
</where>
</select>
<select id="selectNucleicByNucleinId" parameterType="Long" resultMap="NucleicResult">
<include refid="selectNucleicVo"/>
where nuclein_id = #{nucleinId}
</select>
<insert id="insertNucleic" parameterType="Nucleic" useGeneratedKeys="true" keyProperty="nucleinId">
insert into nucleic
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="nucleinName != null">nuclein_name,</if>
<if test="nucleinNumber != null">nuclein_number,</if>
<if test="nucleinDescription != null">nuclein_description,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="nucleinName != null">#{nucleinName},</if>
<if test="nucleinNumber != null">#{nucleinNumber},</if>
<if test="nucleinDescription != null">#{nucleinDescription},</if>
</trim>
</insert>
<update id="updateNucleic" parameterType="Nucleic">
update nucleic
<trim prefix="SET" suffixOverrides=",">
<if test="nucleinName != null">nuclein_name = #{nucleinName},</if>
<if test="nucleinNumber != null">nuclein_number = #{nucleinNumber},</if>
<if test="nucleinDescription != null">nuclein_description = #{nucleinDescription},</if>
</trim>
where nuclein_id = #{nucleinId}
</update>
<delete id="deleteNucleicByNucleinId" parameterType="Long">
delete from nucleic where nuclein_id = #{nucleinId}
</delete>
<delete id="deleteNucleicByNucleinIds" parameterType="String">
delete from nucleic where nuclein_id in
<foreach item="nucleinId" collection="array" open="(" separator="," close=")">
#{nucleinId}
</foreach>
</delete>
</mapper>
Loading…
Cancel
Save