数据库

ruoyi-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>zhaoshang2</artifactId>
 
     <description>
         web服务入口

ruoyi-admin/src/main/resources/application-prod.yml

@@ -5,11 +5,11 @@ ruoyi:
     # 版本
     version: 3.4.0
     # 版权年份
-    copyrightYear: 2021
+    copyrightYear: 2023
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-      profile: /usr/local/zhaoshang/upload
+    profile: /home/ruoyi/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数组计算 char 字符验证

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzLcjlMapper.xml

@@ -42,11 +42,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
+    <!--<select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
         select ANY_VALUE(id) as id, ANY_VALUE(xm_id) as xm_id, ANY_VALUE(xmbh) as xmbh, ANY_VALUE(xmmc)as xmmc,
                ANY_VALUE(dept_id) as dept_id, ANY_VALUE(dept_name) as dept_name, ANY_VALUE(cl_time) as cl_time, ANY_VALUE(progress) as progress
         from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time, progress
         from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
+    </select>-->
+
+    <select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
+        select id, xm_id, xmbh, xmmc,
+               dept_id, dept_name, cl_time, progress
+        from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time, progress
+              from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
     </select>
 
     <insert id="insertZsyzLcjl" parameterType="ZsyzLcjl" useGeneratedKeys="true" keyProperty="id">

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzShyjMapper.xml

@@ -70,7 +70,9 @@
         <include refid="selectZsyzShyjVo"/>
         where l.id = #{id}
     </select>
-    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
+
+
+<!--    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
         SELECT
         ANY_VALUE ( s.id ) as id,
         ANY_VALUE ( s.xm_id ) as xm_id ,
@@ -87,6 +89,36 @@
         <where>
             s.shjg = '2'
             <if test="xmmc != null  and xmmc != ''">and s.xmmc like concat( #{xmmc}, '%') </if>
+            <if test="params.beginTime != null and params.beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;
+                AND date_format(s.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;
+                AND date_format(s.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+            </if>
+        </where>
+        &lt;!&ndash; 数据范围过滤 &ndash;&gt;
+        ${params.dataScope}
+        GROUP BY
+        s.xm_id
+    </select>-->
+
+    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
+        SELECT
+        id,
+        xm_id ,
+        xmbh,
+        dept_id,
+        shrxm,
+        xmjd,
+        xmmc,
+        shjg,
+        shyj,
+        shsj
+        FROM
+        zsyz_shyj
+        <where>
+            shjg = '2'
+            <if test="xmmc != null  and xmmc != ''">and xmmc like concat( #{xmmc}, '%') </if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(s.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
             </if>
@@ -97,7 +129,7 @@
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         GROUP BY
-        s.xm_id
+        xm_id
     </select>
 
     <insert id="insertZsyzShyj" parameterType="ZsyzShyj" useGeneratedKeys="true" keyProperty="id">