Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

client/src/views/OaSystem/personnelManagement/ProjectStatistics/projectTable.vue

@@ -70,7 +70,7 @@ const getDataSource = (params?) => {
         year: params?.year ?? moment().format('YYYY'),
         month: params?.month ?? moment().format('M'),
         userId: params?.userId ?? '',
-        deptId: params?.deptId ? [params.deptId] : [],
+        deptId: params?.deptId ?? '', // 暂不做多选
         projectName: params?.projectName ?? '',
         pageNo: pageNo.value,
         pageSize: 20

client/src/views/OaSystem/personnelManagement/dailyStatistic/index.vue

@@ -3,12 +3,12 @@
     <div class="title">部门日报统计</div>
     <div class="searchBox">
       <el-form :inline="true" class="demo-form-inline">
-        <DeptAndUserSelect
+        <!-- <DeptAndUserSelect
           :defaultDept="deptId"
           :isHideDept="true"
           :deptOnChange="deptOnChange"
           :userOnChange="userOnChange"
-        />
+        /> -->
         <el-form-item label="月份:">
           <el-date-picker
             v-model="reportYearAndMonth"
@@ -138,15 +138,18 @@ const pageTotal = ref(0)
 // 获取日报统计数据
 const getDailyStatisticData = async (): Promise<void> => {
   loading.value = true
-  const params = {
+  const params: any = {
     reportType: 'daily',
     year: moment(reportYearAndMonth.value).format('YYYY'),
     month: moment(reportYearAndMonth.value).format('M'),
-    deptId: deptId.value,
+    // deptId: deptId.value,
     userId: userId.value,
     pageSize: pageSize.value,
     pageNo: pageNo.value
   }
+  if (currentRoute.value?.query?.deptId) {
+    params.deptId = currentRoute.value.query.deptId
+  }
   const { list = [], total = 0 } = await request.get({
     url: '/adm/reportStatistics/query-report-statistics',
     params

client/src/views/OaSystem/personnelManagement/weeklyStatistic/index.vue

@@ -3,12 +3,12 @@
     <div class="title">部门周报统计</div>
     <div class="searchBox">
       <el-form :inline="true" class="demo-form-inline">
-        <DeptAndUserSelect
+        <!-- <DeptAndUserSelect
           :defaultDept="deptId"
           :isHideDept="true"
           :deptOnChange="deptOnChange"
           :userOnChange="userOnChange"
-        />
+        /> -->
         <el-form-item label="月份:">
           <el-date-picker
             v-model="reportYearAndMonth"
@@ -140,15 +140,18 @@ const pageTotal = ref(0)
 // 获取周报统计数据
 const getWeeklyStatisticData = async (): Promise<void> => {
   loading.value = true
-  const params = {
+  const params: any = {
     reportType: 'weekly',
     year: moment(reportYearAndMonth.value).format('YYYY'),
     month: moment(reportYearAndMonth.value).format('M'),
-    deptId: deptId.value,
+    // deptId: deptId.value,
     userId: userId.value,
     pageSize: pageSize.value,
     pageNo: pageNo.value
   }
+  if (currentRoute.value?.query?.deptId) {
+    params.deptId = currentRoute.value.query.deptId
+  }
   const { list = [], total = 0 } = await request.get({
     url: '/adm/reportStatistics/query-report-statistics',
     params

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/dao/UseMoneyDao.java

@@ -58,7 +58,7 @@ public interface UseMoneyDao extends BaseMapperX<UseMoneyDO> {
                 .in(UseMoneyDO::getFlowStatus, FLOW_FINISHED, FLOW_PAYMENT)
                 .and(wq -> wq.in(UseMoneyDO::getDeptId, deptIds)
                         .or()
-                        .in(UseMoneyDO::getProjectId, projectIds))
+                        .in(projectIds.size()>0,UseMoneyDO::getProjectId, projectIds))
                 .orderByDesc(UseMoneyDO::getApplyTime));
     }
 
@@ -67,7 +67,7 @@ public interface UseMoneyDao extends BaseMapperX<UseMoneyDO> {
                 .in(UseMoneyDO::getFlowStatus, FLOW_FINISHED, FLOW_PAYMENT)
                 .and(wq -> wq.eq(UseMoneyDO::getDeptId, pageReqVO.getDeptId())
                         .or()
-                        .in(UseMoneyDO::getProjectId, projectIds))
+                        .in(projectIds.size()>0,UseMoneyDO::getProjectId, projectIds))
                 .orderByDesc(UseMoneyDO::getApplyTime));
     }
 

zjugis-business/src/main/resources/mapper/oracle/AssetProcureDetailMapper.xml

@@ -58,16 +58,18 @@
                 <foreach collection="params.deptIdList" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
+                <if test="params != null  and params.projectIdLists != null and params.projectIdLists.size > 0">
                     or
-                T.project_id in
-                <foreach collection="params.projectIdLists" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-                or
-                T1.project_id in
-                <foreach collection="params.projectIdLists" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
+                    T.project_id in
+                    <foreach collection="params.projectIdLists" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    or
+                    T1.project_id in
+                    <foreach collection="params.projectIdLists" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
                 )
             </if>
             <if test="params != null  and params.projectIdList != null  and params.projectIdList.size > 0">

zjugis-business/src/main/resources/mapper/oracle/LoanMapper.xml

@@ -35,9 +35,8 @@
                 <foreach collection="params.UserDeptList" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
-                    or
                 <if test="params != null  and params.projectIds != null and params.projectIds.size > 0">
-                     L.project_id in
+                    or L.project_id in
                     <foreach collection="params.projectIds" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
@@ -100,9 +99,9 @@
                 <foreach collection="params.UserDeptList" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
-                or
+
                 <if test="params != null  and params.projectIds != null and params.projectIds.size > 0">
-                    L.project_id in
+                    or  L.project_id in
                     <foreach collection="params.projectIds" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>