wangliang 2 жил өмнө
parent
commit
7ee449759b

+ 2 - 2
distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -595,7 +595,7 @@
             <if test="makeMethod != null">
             <if test="makeMethod != null">
                 and f.make_method = #{makeMethod}
                 and f.make_method = #{makeMethod}
             </if>
             </if>
-            <if test="dpr != null">
+            <!-- sql dpr注释 <if test="dpr != null">
                 <if test="dpr.requestUserId != null">
                 <if test="dpr.requestUserId != null">
                     AND a.create_id = #{dpr.requestUserId}
                     AND a.create_id = #{dpr.requestUserId}
                 </if>
                 </if>
@@ -605,7 +605,7 @@
                         #{item}
                         #{item}
                     </foreach>
                     </foreach>
                 </if>
                 </if>
-            </if>
+            </if>-->
         </where>
         </where>
         order by IFNULL(g.update_time, a.update_time) desc, a.paper_number desc
         order by IFNULL(g.update_time, a.update_time) desc, a.paper_number desc
     </select>
     </select>

+ 8 - 8
distributed-print/src/main/resources/application.properties

@@ -57,20 +57,20 @@ spring.activiti.history-level=audit
 #com.qmth.fss.private.config=oss://LTAI4Fi8jVRYT49QBXU9x5QX:97aBLBfkQR5mzCiQa82yWLAH57eUd8@teachcloud-test.oss-cn-shenzhen.aliyuncs.com
 #com.qmth.fss.private.config=oss://LTAI4Fi8jVRYT49QBXU9x5QX:97aBLBfkQR5mzCiQa82yWLAH57eUd8@teachcloud-test.oss-cn-shenzhen.aliyuncs.com
 #com.qmth.fss.private.server=https://teachcloud-test.oss-cn-shenzhen.aliyuncs.com
 #com.qmth.fss.private.server=https://teachcloud-test.oss-cn-shenzhen.aliyuncs.com
 
 
-#com.qmth.fss.public.config=../static/
-#com.qmth.fss.public.server=/static/
-#com.qmth.fss.private.config=../static/
-#com.qmth.fss.private.server=/static/
+com.qmth.fss.public.config=../static/
+com.qmth.fss.public.server=/static/
+com.qmth.fss.private.config=../static/
+com.qmth.fss.private.server=/static/
 
 
 #com.qmth.fss.public.config=/Users/king/git/static
 #com.qmth.fss.public.config=/Users/king/git/static
 #com.qmth.fss.public.server=http://127.0.0.1:7001
 #com.qmth.fss.public.server=http://127.0.0.1:7001
 #com.qmth.fss.private.config=/Users/king/git/static
 #com.qmth.fss.private.config=/Users/king/git/static
 #com.qmth.fss.private.server=http://127.0.0.1:7001
 #com.qmth.fss.private.server=http://127.0.0.1:7001
 
 
-com.qmth.fss.public.config=/Users/king/Downloads/file-temp
-com.qmth.fss.public.server=/file-temp/
-com.qmth.fss.private.config=/Users/king/Downloads/pdf-temp
-com.qmth.fss.private.server=/pdf-temp/
+#com.qmth.fss.public.config=/Users/king/Downloads/file-temp
+#com.qmth.fss.public.server=/file-temp/
+#com.qmth.fss.private.config=/Users/king/Downloads/pdf-temp
+#com.qmth.fss.private.server=/pdf-temp/
 
 
 #\u7CFB\u7EDF\u914D\u7F6E
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
 sys.config.oss=false

+ 4 - 4
teachcloud-task/src/main/resources/application.properties

@@ -63,10 +63,10 @@ spring.activiti.history-level=audit
 #com.qmth.fss.private.config=../static/
 #com.qmth.fss.private.config=../static/
 #com.qmth.fss.private.server=/static/
 #com.qmth.fss.private.server=/static/
 
 
-com.qmth.fss.public.config=/Users/king/Downloads/file-temp
-com.qmth.fss.public.server=/file-temp/
-com.qmth.fss.private.config=/Users/king/Downloads/pdf-temp
-com.qmth.fss.private.server=/pdf-temp/
+com.qmth.fss.public.config=../static/
+com.qmth.fss.public.server=/static/
+com.qmth.fss.private.config=../static/
+com.qmth.fss.private.server=/static/
 
 
 #\u7CFB\u7EDF\u914D\u7F6E
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
 sys.config.oss=false