Prechádzať zdrojové kódy

[CODE]: 费用回显大小写问题

maxianghua 4 rokov pred
rodič
commit
678c4766f2

+ 6 - 4
ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/impl/FtmsorderbillsServiceImpl.java

@@ -12,6 +12,8 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.orderManagement.domain.*;
 import com.ruoyi.orderManagement.mapper.*;
 import com.ruoyi.orderManagement.service.IftmsorderbillsService;
+import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderManagement.statusTracking.mapper.FtmsorderbillsfeesMapper;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,7 +68,7 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         List<Ftmsorderbillscntrs> tmsorderbillsList = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsList(ftmsorderbillscntrs);
         // 查询费用明细
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
-        ftmsorderbillsfees.setFPid(id);
+        ftmsorderbillsfees.setfPid(id);
         List<Ftmsorderbillsfees> tmsorderbillsfeesList = ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees);
         // 查询调度安排明细
         Ftmsorderbillsplans ftmsorderbillsplans = new Ftmsorderbillsplans();
@@ -128,11 +130,11 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
             JSONArray feesJson = JSONArray.parseArray(fees);
             List<Ftmsorderbillsfees> tmsorderbillsfeesList = JSONObject.parseArray(feesJson.toJSONString(), Ftmsorderbillsfees.class);
             for (Ftmsorderbillsfees f : tmsorderbillsfeesList) {
-                f.setFId(null);
-                f.setFPid(pId);
+                f.setfId(null);
+                f.setfPid(pId);
                 f.setOrgId(pId);
                 f.setActId(1000L);
-                f.setFStatus(itemstatus);
+                f.setfStatus(itemstatus);
                 f.setCreateBy(loginUser.getUsername());
                 f.setCreateTime(new Date());
                 if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(f) <= 0) {

+ 6 - 4
ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/impl/FtmsorderbillscarsServiceImpl.java

@@ -17,6 +17,8 @@ import com.ruoyi.finance.mapper.TFeeDoMapper;
 import com.ruoyi.orderManagement.domain.*;
 import com.ruoyi.orderManagement.mapper.*;
 import com.ruoyi.orderManagement.service.IftmsorderbillscarsService;
+import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderManagement.statusTracking.mapper.FtmsorderbillsfeesMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -145,10 +147,10 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             JSONArray feesJson = JSONArray.parseArray(fees);
             List<Ftmsorderbillsfees> tmsorderbillsfeesList = JSONObject.parseArray(feesJson.toJSONString(), Ftmsorderbillsfees.class);
             for (Ftmsorderbillsfees f : tmsorderbillsfeesList) {
-                f.setFPid(pId);
+                f.setfPid(pId);
                 f.setOrgId(pId);
                 f.setActId(1020L);
-                f.setFBillstatus(2L);
+                f.setfBillstatus(2L);
                 f.setCreateBy(loginUser.getUsername());
                 f.setCreateTime(new Date());
                 if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(f) <= 0) {
@@ -208,9 +210,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             JSONArray feesJson = JSONArray.parseArray(fees);
             List<Ftmsorderbillsfees> tmsorderbillsfeesList = JSONObject.parseArray(feesJson.toJSONString(), Ftmsorderbillsfees.class);
             for (Ftmsorderbillsfees a : tmsorderbillsfeesList) {
-                a.setFPid(pId);
+                a.setfPid(pId);
                 a.setActId(1020L);
-                a.setFBillstatus(6L);
+                a.setfBillstatus(6L);
                 a.setCreateTime(new Date());
                 a.setCreateBy(loginUser.getUsername());
                 if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(a) <= 0) {

+ 3 - 3
ruoyi-fleet/src/main/resources/mapper/ftmsorderbillsfeesMapper.xml → ruoyi-fleet/src/main/resources/mapper/statusTracking/ftmsorderbillsfeesMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.mapper.FtmsorderbillsfeesMapper">
+<mapper namespace="com.ruoyi.orderManagement.statusTracking.mapper.FtmsorderbillsfeesMapper">
 
     <resultMap type="FTmsorderbillsfees" id="FTmsorderbillsfeesResult">
         <result property="fId" column="f_id"/>
@@ -65,8 +65,8 @@
         <include refid="selectFTmsorderbillsfeesVo"/>
         <where>
             <if test="fPid != null ">and f_pid = #{fPid}</if>
-            <if test="fPid != null ">and act_id = #{actId}</if>
-            <if test="fPid != null ">and org_id = #{orgId}</if>
+            <!--<if test="fPid != null ">and act_id = #{actId}</if>
+            <if test="fPid != null ">and org_id = #{orgId}</if>-->
             <if test="fLineno != null ">and f_lineno = #{fLineno}</if>
             <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
             <if test="fFeeid != null ">and f_feeid = #{fFeeid}</if>