Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -186,7 +186,7 @@
             left join program_cancellation pc on pc.project_id = a.id and pc.del_flag = '0'
             LEFT JOIN act_ru_task artCan ON pc.proc_ins_id = artCan.PROC_INST_ID_
             ${ew.customSqlSegment}
-            ORDER BY a.create_by_id = #{userId} desc,
+            ORDER BY a.create_time desc,
             <if test="archiveStatusFlag == 1">
                 a.assessment_objective='' desc,
             </if>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -556,8 +556,6 @@
     </update>
 
 
-
-
     <select id="queryByContractId" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReportData">
         SELECT
         a.id,
@@ -928,7 +926,6 @@
     </update>
 
 
-
     <update id="updateCwProjectReportDataById">
         update cw_project_report
         set
@@ -1061,11 +1058,11 @@
 
     <select id="getReportInfoByNoList" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReport">
         select
-            cpr.*,cw_prnl.report_no as "reportNo"
+        cpr.*,cw_prnl.report_no as "reportNo"
         from
-            cw_project_report cpr
+        cw_project_report cpr
         left join
-            cw_project_report_new_line cw_prnl on cpr.id=cw_prnl.report_id
+        cw_project_report_new_line cw_prnl on cpr.id=cw_prnl.report_id
         <where>
             <if test="reportNoList != null">
                 AND cw_prnl.report_no IN
@@ -1137,9 +1134,9 @@
         a.industry,
         a.business_objects
         from
-            cw_project_report a
+        cw_project_report a
         left join
-            cw_project_report_new_line cw_prnl on cpr.id=cw_prnl.report_id
+        cw_project_report_new_line cw_prnl on cpr.id=cw_prnl.report_id
         <where>
             <if test="reportNoList != null">
                 AND cw_prnl.report_no IN
@@ -1220,5 +1217,4 @@
     </select>
 
 
-
 </mapper>