bus公司各种规章制度增加

ruoyi-admin/src/main/java/com/ruoyi/web/pcApi/controller/BusCompanyController.java

@@ -69,7 +69,7 @@ public class BusCompanyController extends BaseController
     public void export(HttpServletResponse response, BusCompany busCompany)
     {
         List<BusCompany> list = busCompanyService.selectBusCompanyList(busCompany);
-        ExcelUtil<BusCompany> util = new ExcelUtil<BusCompany>(BusCompany.class);
+        ExcelUtil<BusCompany> util = new ExcelUtil<>(BusCompany.class);
         util.exportExcel(response, list, "bus公司数据");
     }
 
@@ -82,7 +82,16 @@ public class BusCompanyController extends BaseController
     {
         return AjaxResult.success(busCompanyService.selectBusCompanyByDeptId(deptId));
     }
-
+    /**
+     * 获取bus公司详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('busCompany:busCompany:query')")
+    @GetMapping(value = "/me")
+    public AjaxResult getMeInfo()
+    {
+        Long deptId = getDeptId();
+        return AjaxResult.success(busCompanyService.selectBusCompanyByDeptId(deptId));
+    }
     /**
      * 新增bus公司
      */

ruoyi-admin/src/main/java/com/ruoyi/web/pcApi/controller/TCustomerManageController.java

@@ -64,7 +64,8 @@ public class TCustomerManageController extends BaseController
     public void export(HttpServletResponse response, TCustomerManage tCustomerManage)
     {
         List<TCustomerManage> list = tCustomerManageService.selectTCustomerManageList(tCustomerManage);
-        ExcelUtil<TCustomerManage> util = new ExcelUtil<TCustomerManage>(TCustomerManage.class);
+        ExcelUtil<TCustomerManage> util;
+        util = new ExcelUtil<>(TCustomerManage.class);
         util.exportExcel(response, list, "客户信息管理数据");
     }
 
@@ -137,10 +138,11 @@ public class TCustomerManageController extends BaseController
         orderManage.setStatus("2");
         List<TOrderManage> tOrderManages = tOrderManageService.selectTOrderManageList(orderManage);
         // 用户总消费
-        BigDecimal payTotal = new BigDecimal("0");
-        tOrderManages.forEach(p ->{
-            payTotal.add(p.getOrderMoney());
-        });
+//        BigDecimal payTotal = new BigDecimal("0");
+//        tOrderManages.forEach(p ->{
+//            payTotal.add(p.getOrderMoney());
+//        });
+        BigDecimal payTotal=tOrderManages.stream().map(TOrderManage::getOrderMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
         map.put("orderList",tOrderManages);
         map.put("payTotal",payTotal);
         return AjaxResult.success(map);

ruoyi-admin/src/main/java/com/ruoyi/web/pcApi/domain/BusCompany.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author lzp
  * @date 2022-08-26
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @ToString
 @Builder
@@ -64,6 +65,34 @@ public class BusCompany extends BaseEntity
     @Excel(name = "部门状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
+    /** 出発までの流れ */
+    @Excel(name = "出発までの流れ")
+    private String process;
+
+    /** シートベルト着用のお願い */
+    @Excel(name = "シートベルト着用のお願い")
+    private String safety;
+
+    /** 変更・取消料 */
+    @Excel(name = "シートベルト着用のお願い")
+    private String cancel;
+
+    /** ご利用案内 */
+    @Excel(name = "ご利用案内")
+    private String about;
+
+    /** 標識・約款 */
+    @Excel(name = "標識・約款")
+    private String mark;
+
+    /** プライバシーポリシー */
+    @Excel(name = "プライバシーポリシー")
+    private String privacy;
+
+    /** 　親権者同意書　*/
+    @Excel(name = "親権者同意書")
+    private String agreement;
+
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 

ruoyi-admin/src/main/resources/application-druid.yml

@@ -11,7 +11,7 @@ spring:
 #                password: l*F3m!%Ag57vY0IX
             #正式环境
             master:
-                url: jdbc:mysql://127.0.0.1:3306/one_day_tour?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://52.197.141.149:3306/one_day_tour?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: 5a8bzjy?o&Tu
             # 从库数据源

ruoyi-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/Users/libin/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="[%boldGreen(%d{yyyy-MM-dd HH:mm:ss.SSS})] [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

ruoyi-admin/src/main/resources/mapper/busCompany/BusCompanyMapper.xml

@@ -15,6 +15,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="email"    column="email"    />
         <result property="manager"    column="manager"    />
         <result property="address"    column="address"    />
+        <result property="process"    column="process"    />
+        <result property="safety"    column="safety"   />
+        <result property="cancel"    column="cancel"    />
+        <result property="about"    column="about"    />
+        <result property="mark"    column="mark"    />
+        <result property="privacy"    column="privacy"    />
+        <result property="agreement"   column="agreement"    />
         <result property="status"    column="status"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
@@ -36,6 +43,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.email,
             a.manager,
             a.address,
+            process,
+            a.safety,
+            a.cancel,
+            a.about,
+            a.mark,
+            a.privacy,
+            a.agreement,
             a.STATUS,
             a.del_flag,
             a.create_by,
@@ -60,6 +74,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="email != null  and email != ''"> and email = #{email}</if>
             <if test="manager != null "> and manager = #{manager}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="process != null and process != ''"> and process = #{process}</if>
+            <if test="safety != null and safety != ''"> and safety = #{safety}</if>
+            <if test="cancel != null and cancel != ''"> and cancel = #{cancel}</if>
+            <if test="about != null and about != ''"> and about = #{about}</if>
+            <if test="mark != null and mark != ''"> and mark = #{mark}</if>
+            <if test="privacy != null and privacy != ''"> and privacy = #{privacy}</if>
+            <if test="agreement != null and agreement != ''"> and agreement = #{agreement}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="params.beginDate != null and params.beginDate != ''"><!-- 开始时间检索 -->
                 and date_format(a.create_time,'%y%m%d') &gt;= date_format(#{params.beginDate},'%y%m%d')
@@ -87,6 +108,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="email != null">email,</if>
             <if test="manager != null">manager,</if>
             <if test="address != null">address,</if>
+            <if test="process != null">process,</if>
+            <if test="safety != null">safety,</if>
+            <if test="cancel != null">cancel,</if>
+            <if test="about != null">about,</if>
+            <if test="mark != null">mark,</if>
+            <if test="privacy != null">privacy,</if>
+            <if test="agreement != null">agreement,</if>
             <if test="status != null">status,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -104,6 +132,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="email != null">#{email},</if>
             <if test="manager != null">#{manager},</if>
             <if test="address != null">#{address},</if>
+            <if test="process != null">#{process},</if>
+            <if test="safety != null">#{safety},</if>
+            <if test="cancel != null">#{cancel},</if>
+            <if test="about != null">#{about},</if>
+            <if test="mark != null">#{mark},</if>
+            <if test="privacy != null">#{privacy},</if>
+            <if test="agreement != null">#{agreement},</if>
             <if test="status != null">#{status},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -125,6 +160,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="email != null">email = #{email},</if>
             <if test="manager != null">manager = #{manager},</if>
             <if test="address != null">address = #{address},</if>
+            <if test="process != null">process = #{process},</if>
+            <if test="safety != null">safety = #{safety},</if>
+            <if test="cancel != null">cancel = #{cancel},</if>
+            <if test="about != null">about = #{about},</if>
+            <if test="mark != null">mark = #{mark},</if>
+            <if test="privacy != null">privacy = #{privacy},</if>
+            <if test="agreement != null">agreement = #{agreement},</if>
             <if test="status != null">status = #{status},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -9,6 +9,7 @@ import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.xmlbeans.impl.jam.JField;
 
 /**
  * 部门表 sys_dept
@@ -43,6 +44,77 @@ public class SysDept extends BaseEntity
     /** 邮箱 */
     private String email;
 
+    public String getProcess() {
+        return process;
+    }
+
+    public String getSafety() {
+        return safety;
+    }
+
+    public String getCancel() {
+        return cancel;
+    }
+
+    public String getAbout() {
+        return about;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public String getPrivacy() {
+        return privacy;
+    }
+
+    public String getAgreement() {
+        return agreement;
+    }
+
+    public void setProcess(String process) {
+        this.process = process;
+    }
+
+    public void setSafety(String safety) {
+        this.safety = safety;
+    }
+
+    public void setCancel(String cancel) {
+        this.cancel = cancel;
+    }
+
+    public void setAbout(String about) {
+        this.about = about;
+    }
+
+    public void setMark(String mark) {
+        this.mark = mark;
+    }
+
+    public void setPrivacy(String privacy) {
+        this.privacy = privacy;
+    }
+
+    public void setAgreement(String agreement) {
+        this.agreement = agreement;
+    }
+
+    /** 出発までの流れ */
+    private String process;
+    /** シートベルト着用のお願い */
+    private String safety;
+    /** 変更・取消料 */
+    private String cancel;
+    /** ご利用案内 */
+    private String about;
+    /** 標識・約款 */
+    private String mark;
+    /** プライバシーポリシー */
+    private String privacy;
+    /** 　親権者同意書　*/
+    private String agreement;
+
     /** 部门状态:0正常,1停用 */
     private String status;
 
@@ -53,7 +125,7 @@ public class SysDept extends BaseEntity
     private String parentName;
     
     /** 子部门 */
-    private List<SysDept> children = new ArrayList<SysDept>();
+    private List<SysDept> children = new ArrayList<>();
 
     public Long getDeptId()
     {
@@ -86,7 +158,7 @@ public class SysDept extends BaseEntity
     }
 
     @NotBlank(message = "部门名称不能为空")
-    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
+    @Size(max = 30, message = "部门名称长度不能超过30个字符")
     public String getDeptName()
     {
         return deptName;
@@ -118,7 +190,7 @@ public class SysDept extends BaseEntity
         this.leader = leader;
     }
 
-    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
+    @Size(max = 11, message = "联系电话长度不能超过11个字符")
     public String getPhone()
     {
         return phone;
@@ -130,7 +202,7 @@ public class SysDept extends BaseEntity
     }
 
     @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    @Size(max = 50, message = "邮箱长度不能超过50个字符")
     public String getEmail()
     {
         return email;
@@ -193,6 +265,13 @@ public class SysDept extends BaseEntity
             .append("phone", getPhone())
             .append("email", getEmail())
             .append("status", getStatus())
+            .append("process",getProcess())
+            .append("safety",getSafety())
+            .append("cancel",getCancel())
+            .append("about",getAbout())
+            .append("mark",getMark())
+            .append("privacy",getPrivacy())
+            .append("agreement",getAgreement())
             .append("delFlag", getDelFlag())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())