Skip to content

A
amos-boot-biz
Commit f25f5f51 authored by KeYong's avatar KeYong
Browse files
Options

修改巡检项列表bug

parent 56757441
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 18 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java
View file @ f25f5f51
...@@ -152,24 +152,33 @@ public class InputItemController extends AbstractBaseController { ...@@ -152,24 +152,33 @@ public class InputItemController extends AbstractBaseController {
} }
for (InputItemVo inputItemVo : page.getContent()) { for (InputItemVo inputItemVo : page.getContent()) {
String finalTypeName = ""; String finalTypeName = "";
finalTypeName = StringUtils.isNotEmpty(inputItemVo.getCustomType())? "自定义巡检点" : ""; // finalTypeName = StringUtils.isNotEmpty(inputItemVo.getCustomType())? "自定义巡检点" : "";
String keyPartsTypeName = StringUtils.isNotEmpty(inputItemVo.getKeyPartsType())? "重点部位类型" : ""; // String keyPartsTypeName = StringUtils.isNotEmpty(inputItemVo.getKeyPartsType())? "重点部位类型" : "";
if (StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(keyPartsTypeName)) { // if (StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(keyPartsTypeName)) {
finalTypeName = finalTypeName + "，" + keyPartsTypeName; // finalTypeName = finalTypeName + "，" + keyPartsTypeName;
} else if (!StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(keyPartsTypeName)) { // } else if (!StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(keyPartsTypeName)) {
finalTypeName = keyPartsTypeName; // finalTypeName = keyPartsTypeName;
} // }
String equipmentTypeName = StringUtils.isNotEmpty(inputItemVo.getEquipmentType())? resultMap.get(inputItemVo.getEquipmentType()) : ""; // String equipmentTypeName = StringUtils.isNotEmpty(inputItemVo.getEquipmentType())? resultMap.get(inputItemVo.getEquipmentType()) : "";
if (StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(equipmentTypeName)) { // if (StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(equipmentTypeName)) {
finalTypeName = finalTypeName + "，" + equipmentTypeName; // finalTypeName = finalTypeName + "，" + equipmentTypeName;
} else if (!StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(equipmentTypeName)) { // } else if (!StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(equipmentTypeName)) {
finalTypeName = equipmentTypeName; // finalTypeName = equipmentTypeName;
} // }
String facilitiesTypeName = StringUtils.isNotEmpty(inputItemVo.getFacilitiesType())? resultMap.get(inputItemVo.getFacilitiesType()) : ""; // String facilitiesTypeName = StringUtils.isNotEmpty(inputItemVo.getFacilitiesType())? resultMap.get(inputItemVo.getFacilitiesType()) : "";
if (StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(facilitiesTypeName)) { // if (StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(facilitiesTypeName)) {
finalTypeName = finalTypeName + "，" + facilitiesTypeName; // finalTypeName = finalTypeName + "，" + facilitiesTypeName;
} else if (!StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(facilitiesTypeName)) { // } else if (!StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(facilitiesTypeName)) {
finalTypeName = facilitiesTypeName; // finalTypeName = facilitiesTypeName;
// }
if (inputItemVo.getCustomType().equals("1") && inputItemVo.getKeyPartsType().equals("1")) {
finalTypeName = "";
} else if (inputItemVo.getCustomType().equals("0") && inputItemVo.getKeyPartsType().equals("1")) {
finalTypeName = "自定义巡检点";
} else if (inputItemVo.getCustomType().equals("1") && inputItemVo.getKeyPartsType().equals("0")) {
finalTypeName = "重点部位类型";
} else if (inputItemVo.getCustomType().equals("0") && inputItemVo.getKeyPartsType().equals("0")) {
finalTypeName = "自定义巡检点" + "，" + "重点部位类型";
} }
inputItemVo.setTypeName(finalTypeName); inputItemVo.setTypeName(finalTypeName);
} }
......
amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_input_item.xml
View file @ f25f5f51
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
<result property="customType" column="custom_type" /> <result property="customType" column="custom_type" />
<result property="facilitiesType" column="facilities_type" /> <result property="facilitiesType" column="facilities_type" />
<result property="equipmentType" column="equipment_type" /> <result property="equipmentType" column="equipment_type" />
<result property="riskDesc" column="risk_desc" />
</resultMap> </resultMap>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment