添加定位字段，修改树返回字段

nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java

@@ -77,9 +77,9 @@ public class NuBizNuCustomerServerController extends JeecgController<NuBizNuCust
 	@ApiOperation(value="护理单元客户配置服务指令-添加", notes="护理单元客户配置服务指令-添加")
 //	@RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:add")
 	@PostMapping(value = "/addNuCustomerServer")
-	public Result<String> addNuCustomerServer(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) {
+	public Result<NuBizNuCustomerServer> addNuCustomerServer(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) {
-		nuBizNuCustomerServerService.save(nuBizNuCustomerServer);
+		NuBizNuCustomerServer retText = nuBizNuCustomerServerService.addNuCustomerServer(nuBizNuCustomerServer);
-		return Result.OK("添加成功！");
+		return Result.OK(retText);
 	}
 	
 	/**
@@ -92,9 +92,9 @@ public class NuBizNuCustomerServerController extends JeecgController<NuBizNuCust
 	@ApiOperation(value="护理单元客户配置服务指令-编辑", notes="护理单元客户配置服务指令-编辑")
 //	@RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:edit")
 	@RequestMapping(value = "/editNuCustomerServer", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> editNuCustomerServer(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) {
+	public Result<NuBizNuCustomerServer> editNuCustomerServer(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) {
-		nuBizNuCustomerServerService.updateById(nuBizNuCustomerServer);
+		NuBizNuCustomerServer retJson = nuBizNuCustomerServerService.editNuCustomerServer(nuBizNuCustomerServer);
-		return Result.OK("编辑成功!");
+		return Result.OK(retJson);
 	}
 	
 	/**

nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java

@@ -90,6 +90,10 @@ public class NuBizNuCustomerServer implements Serializable {
     @Excel(name = "周期类型", width = 15)
     @ApiModelProperty(value = "周期类型")
     private java.lang.String cycleType;
+    /**纵向定位*/
+    @Excel(name = "纵向定位", width = 15)
+    @ApiModelProperty(value = "纵向定位")
+    private java.lang.String positioningLong;
 
 
     /**开始时间*/

nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java

@@ -15,4 +15,8 @@ import java.util.Map;
 public interface INuBizNuCustomerServerService extends IService<NuBizNuCustomerServer> {
 
     List<Map<String,Object>> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer);
+
+    NuBizNuCustomerServer addNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer);
+
+    NuBizNuCustomerServer editNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer);
 }

nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java

@@ -56,6 +56,7 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
                     map.put("startTime",par.getStartTime());
                     map.put("endTime",par.getEndTime());
                     map.put("cycleType",par.getCycleType());
+                    map.put("positioningLong",par.getPositioningLong());
                     childrenList.add(map);
                 }
             }
@@ -67,7 +68,7 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
 
 
     @Override
-    public boolean save(NuBizNuCustomerServer nuBizNuCustomerServer) {
+    public NuBizNuCustomerServer addNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer) {
         NuConfigServiceDirective nuConfigServiceDirective = nuConfigServiceDirectiveService.getById(nuBizNuCustomerServer.getDirectiveId());
         NuConfigServiceCategory nuConfigServiceCategory = nuConfigServiceCategoryService.getById(nuConfigServiceDirective.getCategoryId());
         NuConfigServiceType nuConfigServiceType = nuConfigServiceTypeService.getById(nuConfigServiceDirective.getTypeId());
@@ -76,12 +77,12 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
         nuBizNuCustomerServer.setTypeId(nuConfigServiceType.getId());
         nuBizNuCustomerServer.setTypeName(nuConfigServiceType.getTypeName());
         baseMapper.insert(nuBizNuCustomerServer);
-        return true;
+        return nuBizNuCustomerServer;
     }
 
 
     @Override
-    public boolean updateById(NuBizNuCustomerServer nuBizNuCustomerServer) {
+    public NuBizNuCustomerServer editNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer) {
         NuConfigServiceDirective nuConfigServiceDirective = nuConfigServiceDirectiveService.getById(nuBizNuCustomerServer.getDirectiveId());
         NuConfigServiceCategory nuConfigServiceCategory = nuConfigServiceCategoryService.getById(nuConfigServiceDirective.getCategoryId());
         NuConfigServiceType nuConfigServiceType = nuConfigServiceTypeService.getById(nuConfigServiceDirective.getTypeId());
@@ -90,6 +91,6 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
         nuBizNuCustomerServer.setTypeId(nuConfigServiceType.getId());
         nuBizNuCustomerServer.setTypeName(nuConfigServiceType.getTypeName());
         baseMapper.updateById(nuBizNuCustomerServer);
-        return true;
+        return nuBizNuCustomerServer;
     }
 }

nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml

@@ -15,7 +15,7 @@
         csd.iz_reimbursement,
         csd.iz_preferential,
         csd.charging_frequency,
-        csd.cycle_type,
+        dict.item_text AS cycle_type,
         csd.service_content,
         csd.service_duration,
         csd.iz_enabled,
@@ -32,6 +32,8 @@
         FROM  nu_config_service_directive csd
         LEFT JOIN nu_directive_tag dt ON csd.id = dt.directive_id
         LEFT JOIN nu_config_directive_tag cdt ON dt.tag_id = cdt.id
+        LEFT JOIN nu_config_service_type cst ON csd.type_id = cst.id
+        LEFT JOIN (select * from sys_dict_item where dict_id = '1900374791386140674') dict on csd.cycle_type = dict.item_value
         ) a
         ${ew.customSqlSegment}
 

nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java

@@ -63,6 +63,7 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl<NuConfigServ
                     directiceMap.put("title",directicePar.getDirectiveName());
                     directiceMap.put("serviceDuration",directicePar.getServiceDuration());
                     directiceMap.put("tagName",directicePar.getTagName());
+                    directiceMap.put("cycleType",directicePar.getCycleType());
                     directiceMapList.add(directiceMap);
                 }
             }