项目、合同时间范围查询修改

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractController.java

@@ -140,6 +140,7 @@ public class CmcContractController extends BaseController
                     Calendar calendar = Calendar.getInstance();
                     calendar.set(Calendar.YEAR, Integer.parseInt(monthList.get(i).split("-")[0]));
                     calendar.set(Calendar.MONTH, Integer.parseInt(monthList.get(i).split("-")[1]) - 1);
+                    calendar.set(Calendar.DAY_OF_MONTH, 1);
                     String endTimeString = monthList.get(i) + "-" + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
                     Map<String, Object> params = new HashMap<>();
                     params.put("beginTime", beginTimeString + " 00:00:00");
@@ -181,6 +182,7 @@ public class CmcContractController extends BaseController
                 Calendar calendar = Calendar.getInstance();
                 calendar.set(Calendar.YEAR, Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate())));
                 calendar.set(Calendar.MONTH, i - 1);
+                calendar.set(Calendar.DAY_OF_MONTH, 1);
                 String endTimeString = new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()) + "-" + month + "-" + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
                 Map<String, Object> params = new HashMap<>();
                 params.put("beginTime", beginTimeString + " 00:00:00");
@@ -218,6 +220,14 @@ public class CmcContractController extends BaseController
             yearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), totalAmount);
             paidYearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), paidTotalAmount);
         }
+        if (!endTime.equals("")) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.YEAR, Integer.parseInt(endTime.split("-")[0]));
+            calendar.set(Calendar.MONTH, Integer.parseInt(endTime.split("-")[1]) - 1);
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
+            endTime = endTime.split("-")[0] + "-" + endTime.split("-")[1] + "-"
+                    + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+        }
         getProjectSourceStatistic(cmcContract, sourceCountObject, paidSourceCountObject, sourceAmountObject, paidSourceAmountObject, totalCount, paidTotalCount, totalAmount, paidTotalAmount, beginTime, endTime);
         yearCountArray.add(yearCountObject);
         monthCountArray.add(monthCountObject);

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -307,6 +307,7 @@ public class CmcProjectController extends BaseController {
                     Calendar calendar = Calendar.getInstance();
                     calendar.set(Calendar.YEAR, Integer.parseInt(monthList.get(i).split("-")[0]));
                     calendar.set(Calendar.MONTH, Integer.parseInt(monthList.get(i).split("-")[1]) - 1);
+                    calendar.set(Calendar.DAY_OF_MONTH, 1);
                     String endTimeString = monthList.get(i) + "-" + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
                     Map<String, Object> params = new HashMap<>();
                     params.put("beginTime", beginTimeString + " 00:00:00");
@@ -383,6 +384,7 @@ public class CmcProjectController extends BaseController {
                 Calendar calendar = Calendar.getInstance();
                 calendar.set(Calendar.YEAR, Integer.parseInt(cmcProject.getProjectNumber()));
                 calendar.set(Calendar.MONTH, i - 1);
+                calendar.set(Calendar.DAY_OF_MONTH, 1);
                 String endTimeString = cmcProject.getProjectNumber() + "-" + month + "-"
                         + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
                 String monthKey = cmcProject.getProjectNumber() + "-" + month;
@@ -509,6 +511,7 @@ public class CmcProjectController extends BaseController {
             Calendar calendar = Calendar.getInstance();
             calendar.set(Calendar.YEAR, Integer.parseInt(endTime.split("-")[0]));
             calendar.set(Calendar.MONTH, Integer.parseInt(endTime.split("-")[1]) - 1);
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
             endTime = endTime.split("-")[0] + "-" + endTime.split("-")[1] + "-"
                     + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
         }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSubContractController.java

@@ -160,6 +160,7 @@ public class CmcSubContractController extends BaseController
                     Calendar calendar = Calendar.getInstance();
                     calendar.set(Calendar.YEAR, Integer.parseInt(monthList.get(i).split("-")[0]));
                     calendar.set(Calendar.MONTH, Integer.parseInt(monthList.get(i).split("-")[1]) - 1);
+                    calendar.set(Calendar.DAY_OF_MONTH, 1);
                     String endTimeString = monthList.get(i) + "-" + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
                     Map<String, Object> params = new HashMap<>();
                     params.put("beginTime", beginTimeString + " 00:00:00");
@@ -201,6 +202,7 @@ public class CmcSubContractController extends BaseController
                 Calendar calendar = Calendar.getInstance();
                 calendar.set(Calendar.YEAR, Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate())));
                 calendar.set(Calendar.MONTH, i - 1);
+                calendar.set(Calendar.DAY_OF_MONTH, 1);
                 String endTimeString = new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()) + "-" + month + "-" + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
                 Map<String, Object> params = new HashMap<>();
                 params.put("beginTime", beginTimeString + " 00:00:00");
@@ -238,6 +240,14 @@ public class CmcSubContractController extends BaseController
             yearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), totalAmount);
             paidYearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), paidTotalAmount);
         }
+        if (!endTime.equals("")) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.YEAR, Integer.parseInt(endTime.split("-")[0]));
+            calendar.set(Calendar.MONTH, Integer.parseInt(endTime.split("-")[1]) - 1);
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
+            endTime = endTime.split("-")[0] + "-" + endTime.split("-")[1] + "-"
+                    + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+        }
         getProjectSourceStatistic(cmcSubContract, sourceCountObject, paidSourceCountObject, sourceAmountObject, paidSourceAmountObject, totalCount, paidTotalCount, totalAmount, paidTotalAmount, beginTime, endTime);
         yearCountArray.add(yearCountObject);
         monthCountArray.add(monthCountObject);

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBorrowMapper.xml

@@ -142,12 +142,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lendTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', lendTime) == '2000' "> and b.lend_time is not null</if>
             <if test="lendTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', lendTime) != '2000' "> and YEAR(b.lend_time) = YEAR(#{lendTime})</if>
             <if test="params.beginTime != null and params.beginTime != '' and lendTime != null"> and MONTH(b.lend_time) = MONTH(#{lendTime})</if>
-            <if test="params.beginTime != null and params.beginTime != '' and lendTime == null">
-                and date_format(b.apply_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-            </if>
-            <if test="params.endTime != null and params.endTime != '' and lendTime == null">
-                and date_format(b.apply_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-            </if>
             <if test="unionTime != null "> and b.union_time = #{unionTime}</if>
         </where>
         order by b.apply_date desc

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarApprovalMapper.xml

@@ -139,7 +139,7 @@
             <if test="passengers != null "> and ca.passengers = #{passengers}</if>
             <if test="applyDate != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', applyDate) == '2000' "> and ca.apply_date is not null</if>
             <if test="applyDate != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', applyDate) != '2000' "> and YEAR(ca.apply_date) = YEAR(#{applyDate})</if>
-            <if test="params.beginTime != null and params.beginTime != ''"> and MONTH(ca.apply_date) = MONTH(#{applyDate})</if>
+            <if test="params.beginTime != null and params.beginTime != '' and applyDate != null"> and MONTH(ca.apply_date) = MONTH(#{applyDate})</if>
             <if test="beginDate != null "> and ca.begin_date = #{beginDate}</if>
             <if test="endDate != null "> and ca.end_date = #{endDate}</if>
             <if test="days != null "> and ca.days = #{days}</if>
@@ -276,12 +276,4 @@
         </foreach>
     </delete>
 
-    <select id="selectCmcCarApprovalListByRange" parameterType="CmcCarApproval" resultMap="CmcCarApprovalResult">
-        <include refid="selectCmcCarApprovalVo"/>
-        <where>
-            <if test="params.beginTime != null and params.beginTime != ''"> and ca.apply_date &gt;= #{params.beginTime}</if>
-            <if test="params.endTime != null and params.endTime != ''"> and ca.apply_date &lt;= #{params.endTime}</if>
-        </where>
-        order by ca.apply_date desc
-    </select>
 </mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCheckMapper.xml

@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zjlUserId != null "> and c.zjl_user_id = #{zjlUserId}</if>
             <if test="checkTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', checkTime) == '2000' "> and c.check_time is not null</if>
             <if test="checkTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', checkTime) != '2000' "> and YEAR(c.check_time) = YEAR(#{checkTime})</if>
-            <if test="params.beginTime != null and params.beginTime != ''"> and MONTH(c.check_time) = MONTH(#{checkTime})</if>
+            <if test="params.beginTime != null and params.beginTime != '' and checkTime != null"> and MONTH(c.check_time) = MONTH(#{checkTime})</if>
             <if test="zjlComment != null  and zjlComment != ''"> and c.zjl_comment = #{zjlComment}</if>
         </where>
     </select>
@@ -164,12 +164,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="selectCmcCheckListByRange" parameterType="CmcCheck" resultMap="CmcCheckResult">
-        <include refid="selectCmcCheckVo"/>
-        <where>
-            <if test="params.beginTime != null and params.beginTime != ''"> and c.check_time &gt;= #{params.beginTime}</if>
-            <if test="params.endTime != null and params.endTime != ''"> and c.check_time &lt;= #{params.endTime}</if>
-        </where>
-        order by c.check_time desc
-    </select>
 </mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcContractMapper.xml

@@ -166,10 +166,6 @@
             <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
             <if test="partyAName != null  and partyAName != ''"> and pa.party_a_name like concat('%', #{partyAName}, '%')</if>
-<<<<<<< HEAD
-=======
-            
->>>>>>> 2790a39d2f9879e185c89178e7033c6745b4bae9
         </where>
         group by t1.contract_id
         order by t1.draft_time desc

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml

@@ -84,10 +84,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyDate != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', applyDate) == '2000' "> and da.apply_date is not null</if>
             <if test="applyDate != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', applyDate) != '2000' "> and YEAR(da.apply_date) = YEAR(#{applyDate})</if>
             <if test="params.beginTime != null and params.beginTime != '' and applyDate != null"> and MONTH(da.apply_date) = MONTH(#{applyDate})</if>
-            <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != '' and applyDate == null">
-                and date_format(da.apply_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-                and date_format(da.apply_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-            </if>
             <if test="returnDate != null "> and da.return_date = #{returnDate}</if>
             <if test="beginDate != null "> and da.begin_date = #{beginDate}</if>
             <if test="endDate != null "> and da.end_date = #{endDate}</if>
@@ -197,12 +193,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="selectCmcDeviceApprovalListByRange" parameterType="CmcDeviceApproval" resultMap="CmcDeviceApprovalResult">
-        <include refid="selectCmcDeviceApprovalVo"/>
-        <where>
-            <if test="params.beginTime != null and params.beginTime != ''"> and da.apply_date &gt;= #{params.beginTime}</if>
-            <if test="params.endTime != null and params.endTime != ''"> and da.apply_date &lt;= #{params.endTime}</if>
-        </where>
-        order by da.apply_date desc
-    </select>
 </mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -131,12 +131,6 @@
             <if test="entryTime != null "> and p.entry_time = #{entryTime}</if>
             <if test="exitTime != null "> and p.exit_time = #{exitTime}</if>
             <if test="participates != null  and participates != ''"> and find_in_set(#{participates}, p.participates)</if>
-            <if test="params.beginTime != null and params.beginTime != ''">
-                and date_format(p.register_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-            </if>
-            <if test="params.endTime != null and params.endTime != ''">
-                and date_format(p.register_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-            </if>
         </where>
         group by p.project_id
         order by p.register_time desc, p.project_number desc
@@ -320,7 +314,7 @@
         union
         select p.project_id, p.project_number, p.project_name, p.project_leader, p.register_time from cmc_declare d
         left join cmc_project as p on p.project_id = d.project_id
-        where d.user_id = #{participates}) as t
+        where d.user_id = #{participates} and p.project_number is not null) as t
         group by t.project_id
         order by t.register_time desc, t.project_number desc
     </select>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleMapper.xml

@@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmUserId != null "> and s.gm_user_id = #{gmUserId}</if>
             <if test="gmTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', gmTime) == '2000' "> and s.gm_time is not null</if>
             <if test="gmTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', gmTime) != '2000' "> and YEAR(s.gm_time) = YEAR(#{gmTime})</if>
-            <if test="params.beginTime != null and params.beginTime != ''"> and MONTH(s.gm_time) = MONTH(#{gmTime})</if>
+            <if test="params.beginTime != null and params.beginTime != '' and gmTime != null"> and MONTH(s.gm_time) = MONTH(#{gmTime})</if>
             <if test="gmComment != null  and gmComment != ''"> and s.gm_comment = #{gmComment}</if>
         </where>
         group by s.settle_id
@@ -287,13 +287,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="selectCmcSettleListByRange" parameterType="CmcSettle" resultMap="CmcSettleResult">
-        <include refid="selectCmcSettleVo"/>
-        <where>
-            ss.content = '实际结算总金额'
-            <if test="params.beginTime != null and params.beginTime != ''"> and s.gm_time &gt;= #{params.beginTime}</if>
-            <if test="params.endTime != null and params.endTime != ''"> and s.gm_time &lt;= #{params.endTime}</if>
-        </where>
-        order by s.gm_time desc
-    </select>
 </mapper>

oa-ui/src/api/oa/contract/contract.js

@@ -60,7 +60,7 @@ export function delContract(contractId) {
 // 合同统计
 export function getContractStatistic(query) {
   return request({
-    url: '/oa/contract/statistic/',
+    url: '/oa/contract/statistic',
     method: 'get',
     params: query
   })