修改小数点

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -7,6 +7,7 @@ import com.aliyun.oss.model.ObjectMetadata;
 import com.aliyun.oss.model.PutObjectRequest;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.winsea.svc.base.base.entity.*;
 import com.winsea.svc.base.base.service.*;
 import com.winsea.svc.base.base.util.DateUtils;
@@ -2011,6 +2012,25 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         // 下styleDetailTitle
         contextstyle1.setBorderBottom(HSSFCellStyle.BORDER_THIN);
 
+
+        HSSFCellStyle contextstyle2 = wb.createCellStyle();
+        // 指定单元格居中对齐
+        contextstyle2.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        // 指定单元格垂直居中对齐
+        contextstyle2.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+        // 指定单元格自动换行
+        contextstyle2.setWrapText(true);
+        // 设置单元格字体
+        contextstyle2.setFont(fontDetail1);
+        // 右边框
+        contextstyle2.setBorderRight(HSSFCellStyle.BORDER_THIN);
+        // 左边框
+        contextstyle2.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+        // 上边框
+        contextstyle2.setBorderTop(HSSFCellStyle.BORDER_THIN);
+        // 下styleDetailTitle
+        contextstyle2.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+
         HSSFCellStyle contextstyle = wb.createCellStyle();
         // 指定单元格居中对齐
         contextstyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
@@ -2274,6 +2294,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         rowp.setHeightInPoints(20);
         HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
         contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
+        HSSFDataFormat df2 = wb.createDataFormat(); // 此处设置数据格式
+        contextstyle2.setDataFormat(df2.getBuiltinFormat("#,###0.000"));//保留三位小数点
         cell = rowp.createCell(1);
         cell.setCellValue("平均值/合计");
         cell.setCellStyle(styleDetail);
@@ -2343,7 +2365,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         //纯重合计
         cell = rowp.createCell(29);
         cell.setCellValue(netWeightTotal);
-        cell.setCellStyle(contextstyle1);
+        cell.setCellStyle(contextstyle2);
         cell = rowp.createCell(30);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(31);
@@ -2619,6 +2641,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell = rowx.createCell(26);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                HSSFDataFormat df3 = wb.createDataFormat(); // 此处设置数据格式
+                contextstyle2.setDataFormat(df3.getBuiltinFormat("#,###0.000"));//保留两位小数点
                 if (!StringUtils.isEmpty(exportVView.getGrossWeight())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getGrossWeight()));
                 }
@@ -2633,7 +2657,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(29);
                 cell.setCellValue(Double.parseDouble(exportVView.getNetWeight()));
-                cell.setCellStyle(contextstyle);
+                cell.setCellStyle(contextstyle2);
                 cell = rowx.createCell(30);
                 cell.setCellValue(editDouble(exportVView.getDeliveryGrossWeight()));
                 cell.setCellStyle(contextstyle);
@@ -5326,8 +5350,6 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     public Integer getTemWareHouseCountByCondition(Map<String, Object> pageView) {
         return baseMapper.getTemWareHouseCountByCondition(pageView);
     }
-
-
     private String addDateOneDay(Date date) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
@@ -5493,4 +5515,15 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
 
     }
 
+    /**
+     *
+     * 库点利润详情列表
+     * @param warehouseBaseInfo
+     * @return
+     */
+    @Override
+    public Page<WarehouseBaseInfo> selectBaseInfo(WarehouseBaseInfo warehouseBaseInfo) {
+        return null;
+    }
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -68,7 +68,7 @@
         ROUND(a.gross_weight/1000,2) as grossWeight,
         ROUND(a.tare/1000,2) as tare,
         ROUND(a.weight_deduction/1000,2) as buckleWeight,
-        ROUND(a.net_weight/1000,2) as netWeight,
+        ROUND(a.net_weight/1000,3) as netWeight,
         a.unit_deduction as unitDeduction,
         a.solid_grain_price as pureWeightPrice,
         a.pure_weight as pureWeight,
@@ -672,5 +672,52 @@
         ORDER BY
         wbi.update_date;
     </select>
-
+<!--    &lt;!&ndash;获得库点利润详情列表总数&ndash;&gt;-->
+<!--    <select id="getBaseCountByCondition" parameterType="Map" resultType="java.lang.Integer">-->
+<!--        SELECT-->
+<!--        COUNT(w.id)-->
+<!--        FROM warehouse_base_info w-->
+<!--        LEFT JOIN contract_expenses_info c on w.id = c.base_id-->
+<!--        WHERE-->
+<!--        w.comp_id = #{compId}-->
+<!--        <if test="startDate != null">-->
+<!--            AND (DATE_FORMAT(c.pay_deadline,"%Y%m%d") &gt;=-->
+<!--            DATE_FORMAT(#{startDate},"%Y%m%d"))-->
+<!--        </if>-->
+<!--        <if test="endDate != null">-->
+<!--            AND (DATE_FORMAT(c.pay_deadline,"%Y%m%d") &lt;=-->
+<!--            DATE_FORMAT(#{endDate},"%Y%m%d"))-->
+<!--        </if>-->
+<!--        <if test="searchKeyWord != null and searchKeyWord != ''">-->
+<!--            AND (lower(w.warehouse_name) like lower(CONCAT('%',#{searchKeyWord},'%'))-->
+<!--        </if>-->
+<!--    </select>-->
+<!--    &lt;!&ndash;库点利润详情列表查询&ndash;&gt;-->
+<!--    <select id="getBaseListByCondition" parameterType="Map"-->
+<!--            resultType="com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo">-->
+<!--        SELECT-->
+<!--        w.id,-->
+<!--        w.comp_id as compId,-->
+<!--        w.warehouse_name as warehouseName,-->
+<!--        c.pay_deadline as payDeadline,-->
+<!--        FROM warehouse_base_info w-->
+<!--        LEFT JOIN contract_expenses_info c on w.id = c.base_id-->
+<!--        WHERE-->
+<!--        w.comp_id = #{compId}-->
+<!--        <if test="startDate != null">-->
+<!--            AND (DATE_FORMAT(c.pay_deadline,"%Y%m%d") &gt;=-->
+<!--            DATE_FORMAT(#{startDate},"%Y%m%d"))-->
+<!--        </if>-->
+<!--        <if test="endDate != null">-->
+<!--            AND (DATE_FORMAT(c.pay_deadline,"%Y%m%d") &lt;=-->
+<!--            DATE_FORMAT(#{endDate},"%Y%m%d"))-->
+<!--        </if>-->
+<!--        <if test="searchKeyWord != null and searchKeyWord != ''">-->
+<!--            AND (lower(w.warehouse_name) like lower(CONCAT('%',#{searchKeyWord},'%'))-->
+<!--        </if>-->
+<!--        ORDER BY m.signing_date DESC-->
+<!--        <if test="currentPage != null and currentPage != ''">-->
+<!--            LIMIT ${startRecord}, ${pageSize}-->
+<!--        </if>-->
+<!--    </select>-->
 </mapper>