Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/service/impl/ProfitAnalysisServiceImpl.java

@@ -160,7 +160,7 @@ public class ProfitAnalysisServiceImpl implements ProfitAnalysisService {
             for (ProfitAnalysisDto allAccountExpens : profitAnalysisDtos) {
                 BigDecimal applyAmount = allAccountExpens.getApplyAmount() != null ? allAccountExpens.getApplyAmount() : BigDecimal.ZERO;
                 if(applyAmount.compareTo(BigDecimal.ZERO)>0){
-                    allAccountExpens.setRadio(applyAmount.divide(allExpenditure,4,RoundingMode.HALF_UP).multiply(new BigDecimal("100")).toString());
+                    allAccountExpens.setRadio(applyAmount.divide(allExpenditure,4,RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2,RoundingMode.HALF_UP).toString());
                 }
             }
             resultList.addAll(profitAnalysisDtos) ;
@@ -197,7 +197,7 @@ public class ProfitAnalysisServiceImpl implements ProfitAnalysisService {
             for (ProfitAnalysisDto allAccountExpens : allAccountExpenses) {
                 BigDecimal applyAmount = allAccountExpens.getApplyAmount() != null ? allAccountExpens.getApplyAmount() : BigDecimal.ZERO;
                 if(applyAmount.compareTo(BigDecimal.ZERO)>0){
-                    allAccountExpens.setRadio(applyAmount.divide(allExpenditure,4,RoundingMode.HALF_UP).multiply(new BigDecimal("100")).toString());
+                    allAccountExpens.setRadio(applyAmount.divide(allExpenditure,4,RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2,RoundingMode.HALF_UP).toString());
                 }
             }
 

src/main/resources/mapper/modules/admin/TaskStatisticsMapper.xml

@@ -229,6 +229,7 @@
                  left join sys_dept sd on sd.id =su.dept_id
         <where>
              1=1
+           and  iac.orderstatus ='3'
             <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
                 AND DATE_FORMAT( iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
                 DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
@@ -258,9 +259,9 @@
                 </foreach>
             </if>
 
-            <if test="vo.managementSource !=null  and vo.managementSource!=''">
-                and sd.management_source=#{vo.managementSource}
-            </if>
+<!--            <if test="vo.managementSource !=null  and vo.managementSource!=''">-->
+<!--                and sd.management_source=#{vo.managementSource}-->
+<!--            </if>-->
             <if test="vo.deptIds != null and vo.deptIds != '' and vo.deptIds.size() > 0">
                 AND io.deptid  in
                 <foreach collection="vo.deptIds" item="item" open="(" separator="," close=")">