Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java

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

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

@@ -30,7 +30,7 @@ public class NuBizNuCustomerServerController extends JeecgController<NuBizNuCust
 	private INuBizNuCustomerServerService nuBizNuCustomerServerService;
 
 	/**
-	 * 分页列表查询
+	 * PAD端获取服务指令计划表格数据
 	 *
 	 * @param nuBizNuCustomerServer
 	 * @return
@@ -106,7 +106,12 @@ public class NuBizNuCustomerServerController extends JeecgController<NuBizNuCust
 		return Result.OK(nuBizNuCustomerServer);
 	}
 
-
+	 /**
+	  * PAD端保存服务指令计划表格数据
+	  *
+	  * @param nuBizNuCustomerServer
+	  * @return
+	  */
 	 @AutoLog(value = "护理单元客户配置服务指令-添加")
 	 @ApiOperation(value="护理单元客户配置服务指令-添加", notes="护理单元客户配置服务指令-添加")
 //	@RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:add")

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

@@ -56,6 +56,6 @@ public class DirectivePackageDto implements Serializable {
 //    服务标签
     private String instructionTagId;
 //    服务指令集合
-    private List<ConfigServiceDirectiveDto> directivesList;
+    private List<NuBizNuCustomerServer> directivesList;
 
 }

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

@@ -158,6 +158,9 @@ public class NuBizNuCustomerServer implements Serializable {
     @ApiModelProperty(value = "是否是服务指令包")
     private java.lang.String izPackage;
 
+    @ApiModelProperty(value = "指令包ID")
+    private java.lang.String packageId;
+
     /**服务指令列表**/
     @TableField(exist = false)
     private List<NuBizNuCustomerServer> serverList;
@@ -167,4 +170,7 @@ public class NuBizNuCustomerServer implements Serializable {
     /**长者标签列表**/
     @TableField(exist = false)
     private List<NuBizNuCustomerElderTag> tagList;
+    /**服务包中的服务列表**/
+    @TableField(exist = false)
+    private List<NuBizNuCustomerServer> directivesList;
 }

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

@@ -20,5 +20,5 @@ public interface NuBizNuCustomerServerMapper extends BaseMapper<NuBizNuCustomerS
 
     List<DirectivePackageDto> getNcPackagelist(@Param("params") DirectivePackageDto directivePackageDto);
 
-    List<ConfigServiceDirectiveDto> getNcDirectiveList(@Param("params") ConfigServiceDirectiveDto configServiceDirectiveDto);
+    List<NuBizNuCustomerServer> getNcDirectiveList(@Param("params") NuBizNuCustomerServer nuBizNuCustomerServer);
 }

nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml

@@ -11,7 +11,7 @@
         select * from nu_directive_package where del_flag = '0' and iz_enabled = '0'
     </select>
 
-    <select id="getNcDirectiveList" resultType="com.nu.modules.NuBizNuCustomerServer.entity.ConfigServiceDirectiveDto">
+    <select id="getNcDirectiveList" resultType="com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer">
         select a.package_id,b.*,
         c.category_name AS category_name,
         d.type_name AS type_name,
@@ -23,6 +23,10 @@
         left join nu_config_service_type d on b.type_id = d.id
         left join nu_config_service_instruction_tag e on b.instruction_tag_id = e.id
         left join sys_dict_item f on f.dict_id = '1900374791386140674' and f.item_value = b.cycle_type
-
+        <where>
+            <if test="params.params.packageId != null and params.params.packageId != ''">
+                AND a.package_id = #{params.packageId}
+            </if>
+        </where>
     </select>
 </mapper>

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

@@ -121,33 +121,19 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
 //        resMap.put("serviceList",allList);//服务指令计划
 
         for(NuBizNuCustomerServer par : groupList){
-            if(par.getImmediateFile()!=null&&!par.getImmediateFile().equals("")){
+            if(par.getIzPackage().equals("1")){
-                String immediateFile = getImageNetUrl(par.getImmediateFile());
+                String directiveId = par.getDirectiveId();
-                par.setNetImmediateFile(immediateFile);
+                if(directiveId!=null && !directiveId.equals("")){
-            }else{
+                    NuBizNuCustomerServer packageDirective = new NuBizNuCustomerServer();
-                par.setImmediateFile("");
+                    packageDirective.setPackageId(directiveId);
-                par.setNetImmediateFile("");
+                    List<NuBizNuCustomerServer> pdList = baseMapper.getNcDirectiveList(packageDirective);
+                    for(NuBizNuCustomerServer pd : pdList){
+                        getNetImages(pd);
                     }
-            if(par.getImmediateFileFocus()!=null&&!par.getImmediateFileFocus().equals("")){
+                    par.setDirectivesList(pdList);
-                String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus());
-                par.setNetImmediateFileFocus(immediateFileFocus);
-            }else{
-                par.setImmediateFileFocus("");
-                par.setNetImmediateFileFocus("");
                 }
-            if(par.getPreviewFile()!=null&&!par.getPreviewFile().equals("")){
-                String previewFile = getImageNetUrl(par.getPreviewFile());
-                par.setNetPreviewFile(previewFile);
             }else{
-                par.setPreviewFile("");
+                getNetImages(par);
-                par.setNetPreviewFile("");
-            }
-            if(par.getPreviewFileSmall()!=null&&!par.getPreviewFileSmall().equals("")){
-                String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
-                par.setNetPreviewFileSmall(previewFileSmall);
-            }else{
-                par.setPreviewFileSmall("");
-                par.setNetPreviewFileSmall("");
             }
         }
 
@@ -235,6 +221,37 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
         return resMap;
     }
 
+    private NuBizNuCustomerServer getNetImages(NuBizNuCustomerServer par){
+        if(par.getImmediateFile()!=null&&!par.getImmediateFile().equals("")){
+            String immediateFile = getImageNetUrl(par.getImmediateFile());
+            par.setNetImmediateFile(immediateFile);
+        }else{
+            par.setImmediateFile("");
+            par.setNetImmediateFile("");
+        }
+        if(par.getImmediateFileFocus()!=null&&!par.getImmediateFileFocus().equals("")){
+            String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus());
+            par.setNetImmediateFileFocus(immediateFileFocus);
+        }else{
+            par.setImmediateFileFocus("");
+            par.setNetImmediateFileFocus("");
+        }
+        if(par.getPreviewFile()!=null&&!par.getPreviewFile().equals("")){
+            String previewFile = getImageNetUrl(par.getPreviewFile());
+            par.setNetPreviewFile(previewFile);
+        }else{
+            par.setPreviewFile("");
+            par.setNetPreviewFile("");
+        }
+        if(par.getPreviewFileSmall()!=null&&!par.getPreviewFileSmall().equals("")){
+            String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
+            par.setNetPreviewFileSmall(previewFileSmall);
+        }else{
+            par.setPreviewFileSmall("");
+            par.setNetPreviewFileSmall("");
+        }
+        return par;
+    }
 
     @Override
     public NuBizNuCustomerServer addNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer) {
@@ -320,13 +337,17 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
 
         List<DirectivePackageDto> list = baseMapper.getNcPackagelist(directivePackageDto);
 
-        List<ConfigServiceDirectiveDto> directiveList = baseMapper.getNcDirectiveList(new ConfigServiceDirectiveDto());
+        List<NuBizNuCustomerServer> directiveList = baseMapper.getNcDirectiveList(new NuBizNuCustomerServer());
 
         for(DirectivePackageDto et : list){
-            List<ConfigServiceDirectiveDto> directivesList = new ArrayList<>();
+            List<NuBizNuCustomerServer> directivesList = new ArrayList<>();
-            for(ConfigServiceDirectiveDto etd : directiveList){
+            for(NuBizNuCustomerServer etd : directiveList){
                 if(etd.getPackageId().equals(et.getId())){
+<<<<<<< .mine
                     etd.setNetImmediateFile("https://www.focusnu.com/media/upFiles/"+etd.getImmediateFile());
+=======
+                    getNetImages(etd);
+>>>>>>> .theirs
                     directivesList.add(etd);
                 }
             }