Merge branch 'master' into dev-lgl

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

@@ -104,11 +104,12 @@ public class PrjGwtaskController extends BaseController {
                            @RequestParam("limit") Integer pageSize,
                            @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
                            @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
+        SysUserInfo userInfo = getSysUserInfo();
         PageHelper.startPage(pageNum, pageSize);
-
         Map<String, String> paraMap = new HashMap<>();
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
+        paraMap.put("scr",userInfo.getName());
         List<PrjGwtask> list = prjGwtaskService.getGwTaslList(paraMap);
 
         PageInfo<PrjGwtask> pageinfo = new PageInfo<>(list);

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

@@ -181,8 +181,16 @@ public class StaMeetingFeeController extends BaseController {
     //会议费用全部及条件查询
     @ResponseBody
     @RequestMapping(value = "/searchData", method = RequestMethod.POST)
-    public BaseResult searchData(@RequestParam(required = false, defaultValue = "", value = "XMMC") String xmmc, @RequestParam(required = false, defaultValue = "", value = "HYDD") String hydd, @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq, @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq) {
-        List<HashMap<String, Object>> staFeasibilityreport = staMeetingFeeService.searchMeetingCost(xmmc, hydd, qsrq, jzrq);
+    public BaseResult searchData(@RequestParam(required = false, defaultValue = "", value = "XMMC") String xmmc,
+                                 @RequestParam(required = false, defaultValue = "", value = "HYDD") String hydd,
+                                 @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq,
+                                 @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq) {
+        Map<String, String> map = new HashMap<>();
+        map.put("xmmc",xmmc);
+        map.put("hydd",hydd);
+        map.put("qsrq",qsrq);
+        map.put("jzrq",jzrq);
+        List<HashMap<String, Object>> staFeasibilityreport = staMeetingFeeService.searchMeetingCost(map);
         PageInfo<HashMap<String, Object>> pageinfo = new PageInfo<>(staFeasibilityreport);
         List<HashMap<String, Object>> rows = pageinfo.getList();
         int total = (int) pageinfo.getTotal();

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

@@ -1,5 +1,6 @@
 package com.liang.controller;
 
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
@@ -184,8 +185,19 @@ public class StaTravelexpensesController extends BaseController {
     //差旅费用全部及条件查询
     @ResponseBody
     @RequestMapping(value = "/searchData", method = RequestMethod.POST)
-    public BaseResult searchData(@RequestParam(required = false, defaultValue = "", value = "XMMC") String xmmc, @RequestParam(required = false, defaultValue = "", value = "CCDD") String ccdd, @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq, @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq) {
-        List<HashMap<String, Object>> staFeasibilityreport = staTravelexpensesService.searchTravelexpensesCost(xmmc, ccdd, qsrq, jzrq);
+    public BaseResult searchData(@RequestParam(required = false, defaultValue = "", value = "XMMC") String xmmc,
+                                 @RequestParam(required = false, defaultValue = "", value = "CCDD") String ccdd,
+                                 @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq,
+                                 @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq,
+                                 @RequestParam("page") Integer pageNum,
+                                 @RequestParam("limit") Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        Map<String, String> map = new HashMap<>();
+        map.put("xmmc",xmmc);
+        map.put("ccdd",ccdd);
+        map.put("qsrq",qsrq);
+        map.put("jzrq",jzrq);
+        List<HashMap<String, Object>> staFeasibilityreport = staTravelexpensesService.searchTravelexpensesCost(map);
         PageInfo<HashMap<String, Object>> pageinfo = new PageInfo<>(staFeasibilityreport);
         List<HashMap<String, Object>> rows = pageinfo.getList();
         int total = (int) pageinfo.getTotal();

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

@@ -7,6 +7,7 @@ import org.springframework.data.domain.Pageable;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 会议费(StaMeetingFee)表数据库访问层
@@ -112,5 +113,5 @@ public interface StaMeetingFeeDao {
      * @param JZRQ 创建结束日期
      * @return
      */
-    List<HashMap<String, Object>> searchMeetingCost(String XMMC, String HYDD, String QSRQ, String JZRQ);
+    List<HashMap<String, Object>> searchMeetingCost(Map map);
 }

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

@@ -7,6 +7,7 @@ import org.springframework.data.domain.Pageable;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 差旅费(StaTravelexpenses)表数据库访问层
@@ -116,7 +117,7 @@ public interface StaTravelexpensesDao {
      * @param JZRQ 创建结束日期
      * @return
      */
-    List<HashMap<String, Object>> searchTravelexpensesCost(String XMMC, String CCDD, String QSRQ, String JZRQ);
+    List<HashMap<String, Object>> searchTravelexpensesCost(Map map);
 
 }
 

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

@@ -7,6 +7,7 @@ import org.springframework.data.domain.PageRequest;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 会议费(StaMeetingFee)表服务接口
@@ -95,6 +96,6 @@ public interface StaMeetingFeeService {
      * @param JZRQ 创建结束日期
      * @return
      */
-    List<HashMap<String, Object>> searchMeetingCost(String xmmc, String hydd, String QSRQ, String JZRQ);
+    List<HashMap<String, Object>> searchMeetingCost(Map map);
 
 }

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

@@ -101,6 +101,6 @@ public interface StaTravelexpensesService {
      * @param jzrq 创建结束日期
      * @return
      */
-    List<HashMap<String, Object>> searchTravelexpensesCost(String xmmc, String ccdd, String qsrq, String jzrq);
+    List<HashMap<String, Object>> searchTravelexpensesCost(Map map);
 
 }

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 会议费(StaMeetingFee)表服务实现类
@@ -103,7 +104,7 @@ public class StaMeetingFeeServiceImpl implements StaMeetingFeeService {
     }
 
     @Override
-    public List<HashMap<String, Object>> searchMeetingCost(String xmmc, String hydd, String qsrq, String jzrq) {
-        return this.staMeetingFeeDao.searchMeetingCost(xmmc, hydd, qsrq, jzrq);
+    public List<HashMap<String, Object>> searchMeetingCost(Map map) {
+        return this.staMeetingFeeDao.searchMeetingCost(map);
     }
 }

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

@@ -11,6 +11,7 @@ import org.springframework.data.domain.PageRequest;
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 差旅费(StaTravelexpenses)表服务实现类
@@ -106,7 +107,7 @@ public class StaTravelexpensesServiceImpl implements StaTravelexpensesService {
     }
 
     @Override
-    public List<HashMap<String, Object>> searchTravelexpensesCost(String xmmc, String ccdd, String qsrq, String jzrq) {
-        return this.staTravelexpensesDao.searchTravelexpensesCost(xmmc, ccdd, qsrq, jzrq);
+    public List<HashMap<String, Object>> searchTravelexpensesCost(Map map) {
+        return this.staTravelexpensesDao.searchTravelexpensesCost(map);
     }
 }

src/main/resources/mapper/PrjGwtaskDao.xml

@@ -133,6 +133,9 @@
     <select id="getGwTaslList" resultMap="PrjGwtaskMap" parameterType="map">
         select *
         from prj_GwTask p
+        <if test="scr != null and scr != ''">
+        where p.SCR = #{scr}
+        </if>
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
                 order by ${sortName} ${sortOrder}

src/main/resources/mapper/PrjProjectDao.xml

@@ -451,7 +451,7 @@
         left join prj_Budget b on b.XM = p.ID and b.FJ = ''
         where p.XMMB != 1
         <if test="userId != null and userId != ''">
-            and (p.CJR = #{userId} or #{userId} in (select SHR from prj_ApproveRecord where XMID = p.ID))
+           and p.CJR = #{userId}
         </if>
         <if test="deptId != null and deptId != ''">
             and p.SSBM = #{deptId}

src/main/resources/mapper/StaFeasibilityreportDao.xml

@@ -452,7 +452,7 @@
         left join sta_Budget b on b.XM = r.ID and b.FJ = ''
         where 1 = 1
         <if test="userId != null and userId != ''">
-            and (r.CJR = #{userId} or #{userId} in (select SHR from prj_ApproveRecord where XMID = r.ID))
+            and r.CJR = #{userId}
         </if>
         <if test="mc != null and mc != ''">
             and r.MC like '%'+#{mc}+'%'

src/main/resources/mapper/StaMeetingFeeDao.xml

@@ -179,7 +179,7 @@
     </select>
 
     <!--项目报表（会议费）查询 -->
-    <select id="searchMeetingCost" resultType="Map">
+    <select id="searchMeetingCost" resultType="hashmap">
         SELECT sta_MeetingFee.ID,
         sys_dept_info.dept_name AS BM,
         prj_AnnualBudgetDetail.FYMC AS FYLBMC,

src/main/resources/mapper/StaTravelexpensesDao.xml

@@ -175,27 +175,55 @@
                                                                where KYFH like #{kyfh} + '%'
                                                                order by ID desc </select>
     <!-- 项目报表（差旅费）查询  -->
-    <select id="searchTravelexpensesCost" resultType="Map">
-        SELECT sta_Travelexpenses.ID, prj_Project.BM AS XMBH, sys_dept_info.dept_name AS BM, sta_BudgetApproval.XMMC,
-        base_ProjectType.XMLXMC, base_Person.XM AS XMFZR, sta_Travelexpenses.CCDD, sta_Travelexpenses.FYSQ,
-        sta_Travelexpenses.BZFYHS, sta_Travelexpenses.BZFYBHS, sta_Travelexpenses.KYFH, sta_Travelexpenses.CCSY CASE
-        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_Travelexpenses, sta_BudgetApproval, prj_Project, sys_dept_info, base_ProjectType, base_Person WHERE
-        sta_Travelexpenses.ZB = sta_BudgetApproval.ID AND sta_BudgetApproval.XMID = prj_Project.ID AND
-        sta_BudgetApproval.SSBM = sys_dept_info.dept_id AND sta_BudgetApproval.XMLX = base_ProjectType.XMLX AND
-        sta_BudgetApproval.XMFZR = base_Person.ID
-        <if test="XMMC != null and XMMC != ''">AND sta_BudgetApproval.XMMC LIKE '%${XMMC}%'</if>
-        <if test="CCDD != null and CCDD != ''">AND sta_Travelexpenses.CCDD LIKE '%${CCDD}%'</if>
-        <if test="QSRQ != null and QSRQ != ''">
+    <select id="searchTravelexpensesCost" resultType="hashmap">
+        SELECT
+        sta_Travelexpenses.ID,
+        prj_Project.BM AS XMBH,
+        sys_dept_info.dept_name AS BM,
+        sta_BudgetApproval.XMMC,
+        base_ProjectType.XMLXMC,
+        base_Person.XM AS XMFZR,
+        sta_Travelexpenses.CCDD,
+        sta_Travelexpenses.FYSQ,
+        sta_Travelexpenses.BZFYHS,
+        sta_Travelexpenses.BZFYBHS,
+        sta_Travelexpenses.KYFH,
+        sta_Travelexpenses.CCSY,
+        CASE
+
+        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_Travelexpenses,
+        sta_BudgetApproval,
+        prj_Project,
+        sys_dept_info,
+        base_ProjectType,
+        base_Person
+        WHERE
+        sta_Travelexpenses.ZB = sta_BudgetApproval.ID
+        AND sta_BudgetApproval.XMID = prj_Project.ID
+        AND sta_BudgetApproval.SSBM = sys_dept_info.dept_id
+        AND sta_BudgetApproval.XMLX = base_ProjectType.XMLX
+        AND sta_BudgetApproval.XMFZR = base_Person.ID
+        <if test="xmmc != null and xmmc != ''">
+            AND sta_BudgetApproval.XMMC LIKE '%${xmmc}%'
+            </if>
+        <if test="ccdd != null and ccdd != ''">
+            AND sta_Travelexpenses.CCDD LIKE '%${ccdd}%'
+            </if>
+        <if test="qsrq != null and qsrq != ''">
             AND sta_BudgetApproval.SQSJ
             <![CDATA[ >= ]]>
-            #{QSRQ}
+            #{qsrq}
         </if>
-        <if test="JZRQ != null and JZRQ != ''">
+        <if test="jzrq != null and jzrq != ''">
             AND sta_BudgetApproval.SQSJ
             <![CDATA[ <= ]]>
-            #{JZRQ}
+            #{jzrq}
         </if>
     </select>
 </mapper>

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

@@ -36,25 +36,7 @@
                                 <input type="text" id="erpbh" name="erpbh" class="layui-input" autocomplete="off"/>
                             </div>
                         </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 80px; margin-left: -10px">费用申请号</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="bh" name="bh" class="layui-input" autocomplete="off"/>
-                            </div>
-                        </div>
 
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">年度</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="nf" name="nf" class="layui-input" autocomplete="off"/>
-                            </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">审批状态</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="spzt" name="spzt" class="layui-input" autocomplete="off"/>
-                            </div>
-                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px; margin-left: -10px">会议地点</label>
                             <div class="layui-input-inline" style="width: 150px">
@@ -114,6 +96,10 @@
                 <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
             </a>
         </script>
+
+        <script type="text/html" id=" ">
+
+        </script>
     </div>
 </div>
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
@@ -169,7 +155,7 @@
                     {field: 'BZ',width: '5%',title:'备注'},
                     {field: 'KYFH', width: '15%', title: '科研费号'},
                     {field: 'SQSJ', width: '10%', title: '申请时间'},
-                    {field: '', width: '10%', title: '项目责任人'},
+                    {field: 'XMFZR', width: '10%', title: '项目责任人'},
                     {field: 'ID', width: '0', title: 'id', hide: true}