科室模板管理员文件夹优化3136禅道bug

icss-service/src/main/java/com/diagbot/facade/TemplateFolderAdminFacade.java

@@ -85,12 +85,17 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
         }
         templateFolder.setGmtModified(date);
         templateFolder.setModifier(templateFolderVO.getDoctorId().toString());
+        //获取文件夹最大数
+        Integer orderNo =templateFolderService.getMaxNo(templateFolderVO.getHospitalId());
+        Integer num = orderNo == null ? 0 :  orderNo;
+        //templateFolder.setOrderNo(num);
         this.saveOrUpdate(templateFolder);
-        // 如果是新增，id改为负数
+        // 如果是新增，id改为负数,且文件夹放最后。
         if (add) {
             this.update(new UpdateWrapper<TemplateFolder>()
                     .eq("id", templateFolder.getId())
                     .set("id", Long.parseLong("-" + templateFolder.getId()))
+                    .set("order_no",num)
             );
         }
     }

icss-service/src/main/java/com/diagbot/mapper/TemplateFolderMapper.java

@@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2020-01-09
  */
 public interface TemplateFolderMapper extends BaseMapper<TemplateFolder> {
-
+    public Integer  getMaxNo(Long hospitald);
 }

icss-service/src/main/java/com/diagbot/service/TemplateFolderService.java

@@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2020-01-09
  */
 public interface TemplateFolderService extends IService<TemplateFolder> {
-
+    public Integer  getMaxNo(Long hospitald);
 }

icss-service/src/main/java/com/diagbot/service/impl/TemplateFolderServiceImpl.java

@@ -17,4 +17,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TemplateFolderServiceImpl extends ServiceImpl<TemplateFolderMapper, TemplateFolder> implements TemplateFolderService {
 
+    @Override
+    public Integer getMaxNo(Long hospitald) {
+        return baseMapper.getMaxNo(hospitald);
+    }
 }

icss-service/src/main/resources/mapper/TemplateFolderMapper.xml

@@ -18,4 +18,12 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <select id="getMaxNo" resultType="Integer">
+     SELECT MAX(order_no)+1 FROM icss_template_folder WHERE is_deleted ="N"
+        <if test="hospitald != null ">
+      AND hospital_id = #{hospitald}
+        </if>
+      AND template_type = 2
+      and order_no != 99999
+    </select>
 </mapper>