统计报表 临时人员费用 模块 sql 调整

src/main/java/com/liang/controller/StaMaterialController.java

@@ -6,9 +6,8 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
-import com.liang.entity.StaBudgetapproval;
 import com.liang.entity.StaMaterial;
-import com.liang.entity.UtilEntity;
+import com.liang.entity.baobiao.UtilEntity;
 import com.liang.service.PrjAnnualbudgetService;
 import com.liang.service.StaMaterialService;
 import org.springframework.data.domain.Page;

src/main/java/com/liang/dao/StaTempmemberDao.java

@@ -2,6 +2,7 @@ package com.liang.dao;
 
 import com.liang.entity.StaSourceFee;
 import com.liang.entity.StaTempmember;
+import com.spire.ms.System.Security.Cryptography.MACTripleDES;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 
@@ -143,7 +144,7 @@ public interface StaTempmemberDao {
      * @param JZRQ      创建结束日期
      * @return
      */
-    List<HashMap<String, Object>> searchTemeMemberCost(String MC, String SSBMNAME, String SQRQStart, String SQRQEnd, String QSRQ, String JZRQ);
+    List<HashMap<String, Object>> searchTemeMemberCost(Map map);
 
 
     StaTempmember getXm(Map map);

src/main/java/com/liang/entity/baobiao/LsUtilEntity.java

@@ -0,0 +1,108 @@
+package com.liang.entity.baobiao;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Author ly
+ * @Date 2024/7/4 11:28
+ * @Version 1.0
+ */
+public class LsUtilEntity implements Serializable {
+    @JsonProperty("XMMC")
+    private String xmmc;
+
+    @JsonProperty("QSRQ")
+    private String qsrq;
+
+    @JsonProperty("JSRQ")
+    private String jsrq;
+
+    @JsonProperty("ERPBH")
+    private String erpbh;
+    @JsonProperty("NF")
+    private String nf;
+    @JsonProperty("FYSQBH")
+    private String fysqbh;
+
+    @JsonProperty("XM")
+    private String xm;
+
+    @JsonProperty("PYQSSJ")
+    private String pyqssj;
+    @JsonProperty("PYDQSSJ")
+    private String pydqssj;
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public String getQsrq() {
+        return qsrq;
+    }
+
+    public void setQsrq(String qsrq) {
+        this.qsrq = qsrq;
+    }
+
+    public String getJsrq() {
+        return jsrq;
+    }
+
+    public void setJsrq(String jsrq) {
+        this.jsrq = jsrq;
+    }
+
+    public String getErpbh() {
+        return erpbh;
+    }
+
+    public void setErpbh(String erpbh) {
+        this.erpbh = erpbh;
+    }
+
+    public String getNf() {
+        return nf;
+    }
+
+    public void setNf(String nf) {
+        this.nf = nf;
+    }
+
+    public String getFysqbh() {
+        return fysqbh;
+    }
+
+    public void setFysqbh(String fysqbh) {
+        this.fysqbh = fysqbh;
+    }
+
+    public String getXm() {
+        return xm;
+    }
+
+    public void setXm(String xm) {
+        this.xm = xm;
+    }
+
+    public String getPyqssj() {
+        return pyqssj;
+    }
+
+    public void setPyqssj(String pyqssj) {
+        this.pyqssj = pyqssj;
+    }
+
+    public String getPYDQSSJ() {
+        return pydqssj;
+    }
+
+    public void setPYDQSSJ(String PYDQSSJ) {
+        this.pydqssj = PYDQSSJ;
+    }
+}

src/main/java/com/liang/entity/UtilEntity.java

@@ -1,4 +1,4 @@
-package com.liang.entity;
+package com.liang.entity.baobiao;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/main/java/com/liang/service/StaTempmemberService.java

@@ -128,7 +128,7 @@ public interface StaTempmemberService {
      * @param JZRQ      创建结束日期
      * @return
      */
-    List<HashMap<String, Object>> searchTemeMemberCost(String MC, String SSBMNAME, String SQRQStart, String SQRQEnd, String QSRQ, String JZRQ);
+    List<HashMap<String, Object>> searchTemeMemberCost(Map map);
 
     StaTempmember getXm(Map map);
 

src/main/java/com/liang/service/impl/StaTempmemberServiceImpl.java

@@ -118,8 +118,8 @@ public class StaTempmemberServiceImpl implements StaTempmemberService {
     }
 
     @Override
-    public List<HashMap<String, Object>> searchTemeMemberCost(String MC, String SSBMNAME, String SQRQStart, String SQRQEnd, String QSRQ, String JZRQ) {
-        return this.staTempmemberDao.searchTemeMemberCost(MC, SSBMNAME, SQRQStart, SQRQEnd, QSRQ, JZRQ);
+    public List<HashMap<String, Object>> searchTemeMemberCost(Map map) {
+        return this.staTempmemberDao.searchTemeMemberCost(map);
     }
 
     @Override

src/main/resources/mapper/StaTempmemberDao.xml

@@ -296,54 +296,74 @@
     </select>
 
     <!-- 通过条件查询临时费用信息 -->
-    <select id="searchTemeMemberCost" resultType="Map">
-        SELECT sta_TempMember.ID,
+    <select id="searchTemeMemberCost" resultType="HashMap">
+        SELECT
+        sta_TempMember.ID,
         sys_dept_info.dept_name AS BM,
         sta_BudgetApproval.XMMC,
+        sta_BudgetApproval.SQJE,
+        sta_BudgetApproval.ERPBH,
+        sta_Reimbursement.BZJE,
+        sta_BudgetApproval.BH AS ApprovalBH,
+        sta_BudgetApproval.NF,
         base_Person.XM AS XMFZR,
+        base_ProjectType.XMLXMC,
         sta_TempMember.XM,
         sta_TempMember.SFZH,
-        CAST(sta_TempMember.QSRQ AS date) AS QSRQ,
-        CAST(sta_TempMember.JSRQ AS date) AS JSRQ,
+        CAST ( sta_TempMember.QSRQ AS DATE ) AS QSRQ,
+        CAST ( sta_TempMember.JSRQ AS DATE ) AS JSRQ,
         sta_TempMember.FYSQ,
         sta_TempMember.BZFY,
         sta_TempMember.BYXX,
         sta_TempMember.ZY,
         sta_TempMember.XL,
         sta_TempMember.GZDD,
-        sta_BudgetApproval.BH,
+        sta_BudgetApproval.BH AS BudgetBH,
         CASE
-        WHEN sta_BudgetApproval.SFBYJ = 0 THEN '否'
-        WHEN sta_BudgetApproval.SFBYJ = 1 THEN '是'
-        ELSE CAST(sta_BudgetApproval.SFBYJ AS varchar(11))
+
+        WHEN sta_BudgetApproval.SFBYJ = 0 THEN
+        '否'
+        WHEN sta_BudgetApproval.SFBYJ = 1 THEN
+        '是' ELSE CAST ( sta_BudgetApproval.SFBYJ AS VARCHAR ( 11 ) )
         END AS SFBYJ,
-        CAST(sta_BudgetApproval.SQSJ AS date) AS SQSJ
-        FROM sta_TempMember,
-        sta_BudgetApproval,
-        prj_Project,
-        base_Person,
-        sys_dept_info
-        WHERE sta_TempMember.ZB = sta_BudgetApproval.ID
-        AND sta_BudgetApproval.XMID = prj_Project.ID
-        AND sta_BudgetApproval.XMFZR = base_Person.ID
-        AND sta_BudgetApproval.SSBM = sys_dept_info.dept_id
-        <if test="MC != null and MC != ''">
-            AND sta_BudgetApproval.XMMC LIKE '%${MC}%'
+        CAST ( sta_BudgetApproval.SQSJ AS DATE ) AS SQSJ
+        FROM
+        sta_TempMember
+        LEFT JOIN sta_BudgetApproval ON sta_TempMember.ZB = sta_BudgetApproval.ID
+        LEFT JOIN prj_Project ON sta_BudgetApproval.XMID = prj_Project.ID
+        LEFT JOIN base_Person ON sta_BudgetApproval.XMFZR = base_Person.ID
+        LEFT JOIN sys_dept_info ON sta_BudgetApproval.SSBM = sys_dept_info.dept_id
+        LEFT JOIN base_ProjectType ON sta_BudgetApproval.XMLX = base_ProjectType.XMLX
+        LEFT JOIN sta_Reimbursement ON sta_BudgetApproval.ID = sta_Reimbursement.FYSQ
+        WHERE
+        sta_BudgetApproval.XMMC != 'NULL'
+        AND sta_BudgetApproval.SPZT != '作废'
+        <if test="xmmc != null and xmmc != ''">
+            AND sta_BudgetApproval.XMMC LIKE '%'+#{xmmc}+'%'
+        </if>
+        <if test="xm != null and xm != ''">
+            AND sta_TempMember.XM LIKE '%'+#{xm}+'%'
+        </if>
+        <if test="erpbh != null and erpbh != ''">
+            AND sta_BudgetApproval.ERPBH Like '%'+#{erpbh}+'%'
+        </if>
+        <if test="bh != null and bh != ''">
+            AND sta_BudgetApproval.BH like '%'+#{bh}+'%'
         </if>
-        <if test="SSBMNAME != null and SSBMNAME != ''">
-            AND sta_TempMember.XM LIKE '%${SSBMNAME}%'
+        <if test="nf != null and nf != ''">
+            AND sta_BudgetApproval.NF = #{nf}
         </if>
-        <if test="SQRQStart != null and SQRQStart != ''">
-            AND sta_TempMember.QSRQ  <![CDATA[>= ]]> #{SQRQStart}
+        <if test="pyqssj != null and pyqssj != ''">
+            AND sta_TempMember.QSRQ  <![CDATA[>= ]]> #{pyqssj}
         </if>
-        <if test="SQRQEnd != null and SQRQEnd != ''">
-            AND sta_TempMember.JSRQ  <![CDATA[<= ]]> #{SQRQEnd}
+        <if test="pyjssj != null and pyjssj != ''">
+            AND sta_TempMember.JSRQ  <![CDATA[<= ]]> #{pyjssj}
         </if>
-        <if test="QSRQ != null and QSRQ != ''">
-            AND sta_BudgetApproval.SQSJ  <![CDATA[>= ]]> #{QSRQ}
+        <if test="qsrq != null and qsrq != ''">
+            AND sta_BudgetApproval.SQSJ  <![CDATA[>= ]]> #{qsrq}
         </if>
-        <if test="JZRQ != null and JZRQ != ''">
-            AND sta_BudgetApproval.SQSJ  <![CDATA[<= ]]> #{JZRQ}
+        <if test="jsrq != null and jsrq != ''">
+            AND sta_BudgetApproval.SQSJ  <![CDATA[<= ]]> #{jsrq}
         </if>
     </select>
     <select id="getXm" resultMap="StaTempmemberMap" parameterType="map">

src/main/resources/templates/statistical/tempMember.html

@@ -27,25 +27,29 @@
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">项目名称</label>
                             <div class="layui-input-inline" style="width: 224px;">
-                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
+                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">erp编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
+                                <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">费用申请号</label>
                             <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
+                                <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">年度</label>
-                            <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
+                            <label class="layui-form-label" style="width: 60px">年份</label>
+                            <div class="layui-input-inline" style="width: 150px">
+                                <select name="NF" id="NF" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${yearList}" th:text="${item.nf}"
+                                            th:value="${item.nf}"></option>
+                                </select>
                             </div>
                         </div>
                     </div>
@@ -58,25 +62,25 @@
                             </div>
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
+                                <input type="text" name="JSRQ" id="JSRQ" placeholder="结束日期" class="layui-input" readonly>
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 80px">临时人员姓名</label>
                             <div class="layui-input-inline" style="width: 140px">
-                                <input type="text" id="SSBMNAME" name="SSBMNAME" class="layui-input"
+                                <input type="text" id="XM" name="XM" class="layui-input"
                                        autocomplete="off"/>
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 80px">聘用日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="SQRQStart" id="SQRQStart" placeholder="开始日期"
+                                <input type="text" name="PYQSSJ" id="PYQSSJ" placeholder="开始日期"
                                        class="layui-input" readonly>
                             </div>
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="SQRQEnd" id="SQRQEnd" placeholder="结束日期" class="layui-input"
+                                <input type="text" name="PYDQSSJ" id="PYDQSSJ" placeholder="结束日期" class="layui-input"
                                        readonly>
                             </div>
                         </div>
@@ -98,7 +102,9 @@
         </fieldset>
 
         <script type="text/html" id="toolbarDemo">
-
+            <button class="layui-btn layui-btn-sm" lay-event="export" style="background-color: #2f363c" >
+                <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>批量导出
+            </button>
         </script>
 
         <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">
@@ -131,16 +137,16 @@
 
         //日期
         laydate.render({
-            elem: '#SQRQStart'
+            elem: '#PYQSSJ'
         });
         laydate.render({
-            elem: '#SQRQEnd'
+            elem: '#PYDQSSJ'
         });
         laydate.render({
             elem: '#QSRQ'
         });
         laydate.render({
-            elem: '#JZRQ'
+            elem: '#JSRQ'
         });
 
         var currTable = table.render({
@@ -153,21 +159,24 @@
                 [
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', align: 'center'},
+                    {field: 'XMMC', width: '10%', title: '项目名称'},
                     {field: 'BM', width: '7%', title: '项目部门'},
-                    {field: 'XMMC', width: '15%', title: '项目名称', sort: true},
+                    {field: 'XMLXMC',width: '10%',title: '项目类型'},
+                    {field: 'ERPBH',width: '10%',title: 'ERP编号'},
+                    {field: 'ApprovalBH', width: '15%', title: '科研费号'},
+                    {field: 'NF',width: '5%',title: '年份'},
                     {field: 'XMFZR', width: '7%', title: '项目负责人'},
                     {field: 'XM', width: '9%', title: '临聘人员姓名'},
                     {field: 'SFZH', width: '15%', title: '身份证号'},
-                    {field: 'QSRQ', width: '10%', title: '起始日期'},
-                    {field: 'JSRQ', width: '10%', title: '结束日期'},
-                    {field: 'FYSQ', width: '10%', title: '申请费用'},
-                    {field: 'BZFY', width: '10%', title: '报账费用'},
+                    {field: 'QSRQ', width: '10%', title: '聘用起始时间'},
+                    {field: 'JSRQ', width: '10%', title: '聘用截止时间'},
+                    {field: 'SQJE', width: '7%', title: '申请费用'},
+                    {field: 'BZJE', width: '7%', title: '报账费用'},
                     {field: 'BYXX', width: '7%', title: '毕业学校'},
                     {field: 'ZY', width: '7%', title: '专业'},
                     {field: 'XL', width: '7%', title: '学历'},
                     {field: 'GZDD', width: '10%', title: '工作地点'},
-                    {field: 'BH', width: '15%', title: '科研费号'},
-                    {field: 'SFBYJ', width: '10%', title: '是否备用金'},
+                    {field: 'SFBYJ', width: '7%', title: '是否备用金'},
                     {field: 'SQSJ', width: '10%', title: '申请时间'},
                     {field: 'ID', width: '0', title: 'id', hide: true}
                 ]
@@ -211,12 +220,16 @@
         // 监听重置操作
         form.on('submit(data-reset-btn)', function (data) {
             form.val("search-form", {
-                "MC": '',
-                "SSBMNAME": '',
-                'SQRQStart': '',
-                'SQRQEnd': '',
+                "XMMC": '',
+                "ERPBH": '',
+                'FYSQB': '',
                 'QSRQ': '',
-                'JZRQ': ''
+                'JSRQ': '',
+                'XM': '',
+                'PYQSSJ': '',
+                'PYDQSSJ': '',
+                'NF': '',
+
             });
             // 执行搜索重载
             currTable.reload({
@@ -238,10 +251,28 @@
                 }
             });
         });
-        var cancelIndex;
-        /**
-         * toolbar监听事件
-         */
+        // 条件，批量导出
+        table.on('toolbar(currentTableFilter)', function (obj) {
+            if (obj.event ==='export'){
+                var formData = form.val('search-form');
+                console.log(formData);
+                var formDataString = JSON.stringify(formData);
+                AjaxUtil.post({
+                    url:AjaxUtil.ctx +'staTempmember/getAll/'+formDataString,
+                    contentType: "application/json",
+                    timeout: 15000, //大批量导出时会出现超时问题
+                    success: function(res){
+                        console.log(res);
+                        table.exportFile('currentTableId',res.data,'xlsx');
+                    },
+                    error:function (error) {
+                        Message.error(error,2000)
+
+                    }
+                });
+            }
+
+        });
     });