Browse Source

修改订单搜索客户接口

anderx 1 year ago
parent
commit
fd937cd79a

+ 1 - 0
src/main/java/com/goafanti/common/dao/TTaskMemberMapper.java

@@ -23,6 +23,7 @@ public interface TTaskMemberMapper {
     int updateByTid(TTaskMember ttm);
 
     TTaskMember selectByTid(int tid);
+    List<TTaskMember> selectByOrderNo(String orderNo);
 
     void updateSplitSuper(@Param("id") Integer id, @Param("serviceLife") String serviceLife,
                           @Param("serviceYear") String serviceYear, @Param("yearSum") Integer yearSum,

+ 5 - 0
src/main/java/com/goafanti/common/mapper/TTaskMemberMapper.xml

@@ -172,6 +172,11 @@
               and d.finance_id = #{aid})x
       group by x.aid,x.dates
     </select>
+    <select id="selectByOrderNo" resultType="com.goafanti.common.model.TTaskMember">
+      select a.order_no ,b.id ,b.tid ,b.service_life ,b.service_year ,b.year_sum ,b.create_time ,b.contract_term ,b.status
+      from t_order_task a inner join t_task_member b on a.id=b.tid
+      where order_no = #{orderNo}
+    </select>
 
     <update id="updateServiceYearBySplitSuper">
     update t_task_member a,(select a.split_super,GROUP_CONCAT(b.service_year) counts

+ 8 - 3
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -81,7 +81,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     @Autowired
     private ExpenseConfigDetailsMapper expenseConfigDetailsMapper;
     @Autowired
-    private TOrderTaskMapper tOrderTaskMapper;
+    private TTaskMemberMapper tTaskMemberMapper;
     @Autowired
     private TOrderPublicReleaseCountMapper tOrderPublicReleaseCountMapper;
 
@@ -1427,13 +1427,18 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
     private String getString(SonExpenseAccount e, TOrderPublicReleaseCount out, BigDecimal reduce) {
         String maxString=":应公出" + out.getMaxDuration() + "小时";
-        if (out.getMaxDuration().equals(-1d))maxString=":不限制公出小时";
+        String actualString=",超过" + out.getExceedDuration() + "小时";
+        if (out.getMaxDuration().equals(-1d)){
+            maxString=":不限制公出小时";
+            actualString=",";
+        }
+
         String str = e.getBuyerName() + e.getContractNo() +
                 maxString +
                 ",已" + out.getPeopleCount() + "人公出," +
                 out.getFrequency() + "次" +
                 "," + out.getActualDuration() + "小时" +
-                ",超过" + out.getExceedDuration() + "小时" +
+                actualString+
                 ",已报销" + reduce.stripTrailingZeros().toPlainString() + "元";
         return str;
     }