Browse Source

新增报销详情接口

anderx 2 years ago
parent
commit
5e65513768

+ 3 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -267,7 +267,9 @@
     a.id, a.prid, a.order_no orderNo, a.aid, a.aname, a.`type`, a.type_other typeOther , a.status, a.process_status processStatus,
            a.total_amount totalAmount, a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,
            a.district_name districtName, a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,
-           b.name appDepName,c.name payDepName
+           b.name appDepName,c.name payDepName,date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
+            date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
+            date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr
   </sql>
   <select id="selectByid" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccount">
     SELECT

+ 4 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -17,6 +17,7 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.expenseAccount.Enums.EAProcessStatus;
 import com.goafanti.expenseAccount.bo.*;
 import com.goafanti.expenseAccount.service.ExpenseAccountService;
+import com.sun.corba.se.spi.ior.iiop.IIOPFactories;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -202,9 +203,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
     @Override
     public Object selectByPrid(InputExpenseAccount in) {
+        Integer id=null;
         in.setAid(TokenManager.getAdminId());
         OutExpenseAccount useEa = expenseAccountMapper.selectByaidAndPrid(in);
-        return useEa.getId();
+        if (useEa!=null&&useEa.getId()!=null)id=useEa.getId();
+        return id;
     }
 
     @Override