幼儿收费

2020-12-11 17:35:51 +08:00
parent e417fee67e
commit df1f33ddcc
10 changed files with 602 additions and 18 deletions
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolchargeController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolchargeController.java
@ -45,6 +45,17 @@ public class BySchoolchargeController extends BaseController {
        return getDataTable(list);
    }

+    /**
+     * 查询幼儿收费列表
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:schoolcharge:list')")
+    @GetMapping("/child/list")
+    public TableDataInfo childlist(BySchoolcharge bySchoolcharge) {
+        startPage();
+        List<BySchoolcharge> list = bySchoolchargeService.selectByChildchargeList(bySchoolcharge);
+        return getDataTable(list);
+    }
+
    /**
     * 导出园所收费标准列表
     */
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcharge.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcharge.java
@ -44,8 +44,51 @@ public class BySchoolcharge extends BaseEntity {
    @Excel(name = "创建人")
    private Long createUserid;

+    /**
+     * 保育费小班
+     */
+    @Excel(name = "保育费小班")
+    private Double byfX;
+
+    /**
+     * 伙食费小班
+     */
+    @Excel(name = "伙食费小班")
+    private Double hsfX;
+
+    /**
+     * 保育费托班
+     */
+    @Excel(name = "保育费托班")
+    private Double byfT;
+
+    /**
+     * 伙食费托班
+     */
+    @Excel(name = "伙食费托班")
+    private Double hsfT;
+
+    /**
+     * 保育费中班
+     */
+    @Excel(name = "保育费中班")
+    private Double byfZ;
+
+    /**
+     * 伙食费中班
+     */
+    @Excel(name = "伙食费中班")
+    private Double hsfZ;
+
    private SysDept dept;

+    // 幼儿考勤系统属性
+    private String month;
+    private String name;
+    private String classid;
+    private Long days;
+    private String bjtype;
+
    public void setId(Long id) {
        this.id = id;
    }
@ -94,6 +137,94 @@ public class BySchoolcharge extends BaseEntity {
        this.dept = dept;
    }

+    public void setByfX(Double byfX) {
+        this.byfX = byfX;
+    }
+
+    public Double getByfX() {
+        return byfX;
+    }
+
+    public void setHsfX(Double hsfX) {
+        this.hsfX = hsfX;
+    }
+
+    public Double getHsfX() {
+        return hsfX;
+    }
+
+    public void setByfT(Double byfT) {
+        this.byfT = byfT;
+    }
+
+    public Double getByfT() {
+        return byfT;
+    }
+
+    public void setHsfT(Double hsfT) {
+        this.hsfT = hsfT;
+    }
+
+    public Double getHsfT() {
+        return hsfT;
+    }
+
+    public void setByfZ(Double byfZ) {
+        this.byfZ = byfZ;
+    }
+
+    public Double getByfZ() {
+        return byfZ;
+    }
+
+    public void setHsfZ(Double hsfZ) {
+        this.hsfZ = hsfZ;
+    }
+
+    public Double getHsfZ() {
+        return hsfZ;
+    }
+
+    public String getMonth() {
+        return month;
+    }
+
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getClassid() {
+        return classid;
+    }
+
+    public void setClassid(String classid) {
+        this.classid = classid;
+    }
+
+    public Long getDays() {
+        return days;
+    }
+
+    public void setDays(Long days) {
+        this.days = days;
+    }
+
+    public String getBjtype() {
+        return bjtype;
+    }
+
+    public void setBjtype(String bjtype) {
+        this.bjtype = bjtype;
+    }
+
    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@ -104,6 +235,17 @@ public class BySchoolcharge extends BaseEntity {
                .append("createUserid", getCreateUserid())
                .append("createTime", getCreateTime())
                .append("dept", getDept())
+                .append("byfX", getByfX())
+                .append("hsfX", getHsfX())
+                .append("byfT", getByfT())
+                .append("hsfT", getHsfT())
+                .append("byfZ", getByfZ())
+                .append("hsfZ", getHsfZ())
+                .append("month", getMonth())
+                .append("name", getName())
+                .append("classid", getClassid())
+                .append("bjtype", getBjtype())
+                .append("days", getDays())
                .toString();
    }
 }
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/BySchoolchargeMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/BySchoolchargeMapper.java
@ -27,6 +27,14 @@ public interface BySchoolchargeMapper {
     */
    public List<BySchoolcharge> selectBySchoolchargeList(BySchoolcharge bySchoolcharge);

+    /**
+     * 查询幼儿收费列表
+     *
+     * @param bySchoolcharge 收费标准
+     * @return 幼儿收费集合
+     */
+    public List<BySchoolcharge> selectByChildchargeList(BySchoolcharge bySchoolcharge);
+
    /**
     * 新增园所收费标准
     *
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IBySchoolchargeService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IBySchoolchargeService.java
@ -27,6 +27,14 @@ public interface IBySchoolchargeService {
     */
    public List<BySchoolcharge> selectBySchoolchargeList(BySchoolcharge bySchoolcharge);

+    /**
+     * 查询幼儿收费列表
+     *
+     * @param bySchoolcharge 收费标准
+     * @return 幼儿收费集合
+     */
+    public List<BySchoolcharge> selectByChildchargeList(BySchoolcharge bySchoolcharge);
+
    /**
     * 新增园所收费标准
     *
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/BySchoolchargeServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/BySchoolchargeServiceImpl.java
@ -44,6 +44,18 @@ public class BySchoolchargeServiceImpl implements IBySchoolchargeService {
        return bySchoolchargeMapper.selectBySchoolchargeList(bySchoolcharge);
    }

+    /**
+     * 查询幼儿收费列表
+     *
+     * @param bySchoolcharge 收费标准
+     * @return 幼儿收费集合
+     */
+    @Override
+    @DataScope(deptAlias = "b")
+    public List<BySchoolcharge> selectByChildchargeList(BySchoolcharge bySchoolcharge){
+        return bySchoolchargeMapper.selectByChildchargeList(bySchoolcharge);
+    }
+
    /**
     * 新增园所收费标准
     *
--- a/ruoyi/src/main/resources/mybatis/benyi/BySchoolchargeMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/BySchoolchargeMapper.xml
@ -11,6 +11,17 @@
        <result property="hsf" column="hsf"/>
        <result property="createUserid" column="create_userid"/>
        <result property="createTime" column="create_time"/>
+        <result property="byfX" column="byf_x"/>
+        <result property="hsfX" column="hsf_x"/>
+        <result property="byfT" column="byf_t"/>
+        <result property="hsfT" column="hsf_t"/>
+        <result property="byfZ" column="byf_z"/>
+        <result property="hsfZ" column="hsf_z"/>
+        <result property="month" column="month"/>
+        <result property="name" column="name"/>
+        <result property="classid" column="classid"/>
+        <result property="days" column="days"/>
+        <result property="bjtype" column="bjtype"/>
        <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
    </resultMap>

@ -24,16 +35,29 @@
    </resultMap>

    <sql id="selectBySchoolchargeVo">
-        select a.id, a.dept_id, a.byf, a.hsf, a.create_userid, a.create_time,b.dept_name from by_schoolcharge a
+        select a.id, a.dept_id, a.byf, a.hsf, a.create_userid, a.create_time,a.byf_x, a.hsf_x, a.byf_t, a.hsf_t, a.byf_z, a.hsf_z,b.dept_name from by_schoolcharge a
        right join sys_dept b on a.dept_id=b.dept_id
    </sql>

    <select id="selectBySchoolchargeList" parameterType="BySchoolcharge" resultMap="BySchoolchargeResult">
        <include refid="selectBySchoolchargeVo"/>
        where school_id is not null and del_flag=0
-            <if test="byf != null ">and byf = #{byf}</if>
-            <if test="hsf != null ">and hsf = #{hsf}</if>
-            <if test="createUserid != null ">and create_userid = #{createUserid}</if>
+        <if test="byf != null ">and byf = #{byf}</if>
+        <if test="hsf != null ">and hsf = #{hsf}</if>
+        <if test="createUserid != null ">and create_userid = #{createUserid}</if>
+        <!-- 数据范围过滤 -->
+        ${dataScope}
+    </select>
+
+    <select id="selectByChildchargeList" parameterType="BySchoolcharge" resultMap="BySchoolchargeResult">
+        select a.name,a.classid,
+        c.bjtype,
+        (select count(*) from by_child_checkin_detail where childid=a.id and type='01' and date_format(create_time,'%Y-%m')=concat(#{month})) as days ,
+        b.id, b.dept_id, b.byf, b.hsf, b.create_userid, b.create_time,b.byf_x, b.hsf_x, b.byf_t, b.hsf_t, b.byf_z, b.hsf_z
+        from by_child a
+        left join by_class c on a.classid=c.bjbh
+        left join by_schoolcharge b on a.schoolid=b.dept_id
+        where c.bjbh = #{classid}
        <!-- 数据范围过滤 -->
        ${dataScope}
    </select>
@ -51,6 +75,12 @@
            <if test="hsf != null ">hsf,</if>
            <if test="createUserid != null ">create_userid,</if>
            <if test="createTime != null ">create_time,</if>
+            <if test="byfX != null ">byf_x,</if>
+            <if test="hsfX != null ">hsf_x,</if>
+            <if test="byfT != null ">byf_t,</if>
+            <if test="hsfT != null ">hsf_t,</if>
+            <if test="byfZ != null ">byf_z,</if>
+            <if test="hsfZ != null ">hsf_z,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="deptId != null ">#{deptId},</if>
@ -58,6 +88,12 @@
            <if test="hsf != null ">#{hsf},</if>
            <if test="createUserid != null ">#{createUserid},</if>
            <if test="createTime != null ">#{createTime},</if>
+            <if test="byfX != null ">#{byfX},</if>
+            <if test="hsfX != null ">#{hsfX},</if>
+            <if test="byfT != null ">#{byfT},</if>
+            <if test="hsfT != null ">#{hsfT},</if>
+            <if test="byfZ != null ">#{byfZ},</if>
+            <if test="hsfZ != null ">#{hsfZ},</if>
        </trim>
    </insert>

@ -69,6 +105,12 @@
            <if test="hsf != null ">hsf = #{hsf},</if>
            <if test="createUserid != null ">create_userid = #{createUserid},</if>
            <if test="createTime != null ">create_time = #{createTime},</if>
+            <if test="byfX != null ">byf_x = #{byfX},</if>
+            <if test="hsfX != null ">hsf_x = #{hsfX},</if>
+            <if test="byfT != null ">byf_t = #{byfT},</if>
+            <if test="hsfT != null ">hsf_t = #{hsfT},</if>
+            <if test="byfZ != null ">byf_z = #{byfZ},</if>
+            <if test="hsfZ != null ">hsf_z = #{hsfZ},</if>
        </trim>
        where id = #{id}
    </update>