修改油站班结，油站调价

yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java

@@ -13,6 +13,7 @@ import java.util.*;
 
 import com.yijia.common.annotation.Excel;
 import com.yijia.common.config.YiJiaConfig;
+import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.common.core.domain.model.LoginUser;
 import com.yijia.common.exception.CustomException;
 import com.yijia.common.utils.SecurityUtils;
@@ -20,6 +21,7 @@ import com.yijia.station.domain.*;
 import com.yijia.station.mapper.PayOrderMapper;
 import com.yijia.station.service.*;
 import com.yijia.station.utils.FeiEPrinterUtil;
+import com.yijia.system.service.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -65,7 +67,8 @@ public class StationClassStructureController extends BaseController
     @Autowired
     private ISysUserService sysUserService;
     @Autowired
-    private IStationPayService stationPayService;
+    private ISysDeptService sysDeptService;
+
     /**
      * 查询班结管理列表
      */
@@ -789,10 +792,8 @@ public class StationClassStructureController extends BaseController
             i=stationClassesSummaryService.insertStationClassesSummary(stationClassesSummary);
             //班结成功，打印小票
             //根据油站查询是否打印班结小票
-            StationPay  stationPay =new StationPay();
-            stationPay.setStationId(stationId);
-            StationPay pay = stationPayService.selectStationPayOne(stationPay);
-            if(pay!=null &&pay.getWsPrintFlag() !=null &&pay.getWsPrintFlag()!="" &&pay.getWsPrintFlag().equals("1")){
+            SysDept dept = sysDeptService.selectDeptById(stationId);
+            if(dept!=null &&dept.getWsPrintFlag() !=null &&dept.getWsPrintFlag()!="" &&dept.getWsPrintFlag().equals("1")){
                 //查询班结小票数据
                 StationClassStructure classStructure= new StationClassStructure();
                 classStructure.setClassStructureNo(no);

yijia-station/src/main/java/com/yijia/station/controller/StationOilPriceAdjustController.java

@@ -18,6 +18,7 @@ import com.yijia.system.service.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -38,7 +39,7 @@ import com.yijia.common.core.page.TableDataInfo;
 /**
  * 油品调价信息Controller
  *
- * @author yijia
+ * @author yijiaadjust
  * @date 2020-12-09
  */
 @RestController
@@ -108,6 +109,7 @@ public class StationOilPriceAdjustController extends BaseController
      */
     @Log(title = "油品调价信息", businessType = BusinessType.INSERT)
     @PostMapping
+    @Transactional
     public AjaxResult add(@RequestBody StationOilPriceAdjust stationOilPriceAdjust) throws ParseException {
         Date date=new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -283,19 +283,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDayReport" parameterType="Long" resultMap="PayOrderResult">
         SELECT date_format( b.created_date, '%Y-%m-%d' ) as created_date,sum(b.amt) as amt,sum(b.qyamt) as qy_amt, sum(b.cyamt) as cy_amt,sum(b.order_liters) as order_liters ,count(b.order_no) order_no ,sum(b.member_amt) as menber_amt,sum(receivable_amt) as receivable_amt,sum(received_amt) as received_amt
         from (SELECT a.*,(SELECT sum(amt) as qyamt from pay_order where order_no=a.order_no and oil_type=2) as qyamt , (SELECT sum(amt) as qyamt from pay_order where order_no=a.order_no and oil_type=1) as cyamt
-        from pay_order a) b
-        <where>
-            <if test="stationId != null "> and station_id = #{stationId}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
-            <if test="stationIdList != null ">
-                and station_id in
-                <foreach item="item" index="index" collection="stationIdList"
-                         open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
+        from pay_order a
+            <where>
+                <if test="stationId != null "> and a.station_id = #{stationId}</if>
+                <if test="status != null "> and a.status = #{status}</if>
+                <if test="orderType != null  and orderType != ''"> and a.order_type = #{orderType}</if>
+                <if test="stationIdList != null ">
+                    and a.station_id in
+                    <foreach item="item" index="index" collection="stationIdList"
+                             open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+            </where>
+        ) b
         GROUP BY  date_format( created_date, '%Y-%m-%d' )
         ORDER BY date_format( created_date, '%Y-%m-%d' ) DESC
     </select>

yijia-station/src/main/resources/mapper/station/StationOilGunMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="oilGunNo != null  and oilGunNo != ''"> and g.oil_gun_no = #{oilGunNo}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="oilName != null"> and oil_name = #{oilName}</if>
             <if test="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"

yijia-station/src/main/resources/mapper/station/StationOilPriceAdjustMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectStationOilPriceAdjustList" parameterType="StationOilPriceAdjust" resultMap="StationOilPriceAdjustResult">
-        select a.adjust_price_id, p.oil_name as oil_name, a.oil_adjust_price, a.take_effect_status, a.take_effect_date, a.adjust_date, a.station_id, d.dept_name as station_name,a.operator, a.oil_price_id,a.status
+        select a.adjust_price_id,p.oil_name, a.oil_adjust_price, a.take_effect_status, a.take_effect_date, a.adjust_date, a.station_id, d.dept_name as station_name,a.operator, a.oil_price_id,a.status
         from station_oil_price_adjust a
         join sys_dept  d on a.station_id =d.dept_id
         join station_oil_price p on p.oil_price_id =a.oil_price_id