Explorar o código

Merge branch 'V2.0.1' into test

zhaoxian %!s(int64=3) %!d(string=hai) anos
pai
achega
c78202183d

+ 1 - 0
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/SysManagerCompanyMapper.xml

@@ -6,6 +6,7 @@
         SELECT id, depart_name
         FROM `jeecg-boot`.sys_depart
         WHERE parent_id = #{designId}
+        ORDER BY depart_order
     </select>
 
     <select id="queryAllPersonnel" resultType="string">

+ 2 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/SysManagerCompanyServiceImpl.java

@@ -360,7 +360,7 @@ public class SysManagerCompanyServiceImpl extends ServiceImpl<SysManagerCompanyM
             Long materialNum = material.getLong("todayCount");
             Double yesCount = material.getDouble("yesCount");
             BigDecimal materialRatio = BigDecimal.valueOf((materialNum - yesCount) / yesCount).multiply(hundred);
-            String materialRatioStr = unitRatio.setScale(2, RoundingMode.HALF_UP).toString();
+            String materialRatioStr = materialRatio.setScale(2, RoundingMode.HALF_UP).toString();
 
             List<JSONObject> operateList = mapper.queryDepartByParentId(company.getTtOperateId());
             if (Check.isNull(list) || list.isEmpty()) {
@@ -411,7 +411,7 @@ public class SysManagerCompanyServiceImpl extends ServiceImpl<SysManagerCompanyM
             Long materialNum = material.getLong("todayCount");
             Double yesCount = material.getDouble("yesCount");
             BigDecimal materialRatio = BigDecimal.valueOf((materialNum - yesCount) / yesCount).multiply(hundred);
-            String materialRatioStr = unitRatio.setScale(2, RoundingMode.HALF_UP).toString();
+            String materialRatioStr = materialRatio.setScale(2, RoundingMode.HALF_UP).toString();
 
             List<JSONObject> operateList = mapper.queryDepartByParentId(company.getKsOperateId());
             if (Check.isNull(list) || list.isEmpty()) {