Commit 0388261e by kangxiaoshan

合同导出

parent 7dbba580
......@@ -27,7 +27,6 @@ public interface ContractMoneyRepository extends JpaRepository<ContractMoney, Lo
// @Query(value = "select a.id,b.customer_body company,a.contract_code,u.name create_name,a.create_account,a.create_time,a.ds,a.email,a.modify_account,a.modify_time,a.money,a.platform,a.type,a.user,a.del_flag,b.sale salse,b.price_level from contract_money a left join contract b on a.contract_code = b.contract_code left join user u on a.create_account = u.id where a.ds >= ?1 and a.ds <= ?2 and a.platform = ?3 order by a.ds desc",nativeQuery = true)
// List<ContractMoney> findByDsAllContract(String startDate, String endDate, String platfrom);
// @Query(value = "select a.id,b.customer_body company,a.contract_code,u.name create_name,a.create_account,a.create_time,a.ds,a.email,a.modify_account,a.modify_time,a.money,a.platform,a.type,a.user,a.del_flag,b.sale salse,b.price_level from contract_money a left join contract b on a.contract_code = b.contract_code left join user u on a.create_account = u.id where a.ds >= ?1 and a.ds <= ?2 and a.platform = ?3 and a.type = ?4 and b.price_level = ?5 order by a.ds desc",nativeQuery = true)
// List<ContractMoney> findByDsAllContractAll(String startDate, String endDate, String platfrom, String moneyType, String packageTypeSearch);
//
......
......@@ -6,17 +6,21 @@ package dic;
*/
public enum ContractStatusEnum {
WAIT("wait","未执行"),
WAIT("wait", "未执行"),
EXECUTING("executing", "执行中"),
END("end", "已结束"),
MONEY_BACK_ALL("backall","已回款"),
MONEY_BACK_FIRST("backfirst","先回款待录入"),
MONEY_BACK_NONE("backnone","未回款"),
MONEY_BACK_PART("backpart","部分回款"),
MONEY_BACK_ALL("backall", "已回款"),
MONEY_BACK_FIRST("backfirst", "先回款待录入"),
MONEY_BACK_NONE("backnone", "未回款"),
MONEY_BACK_PART("backpart", "部分回款"),
CANCEL("cancel", "作废"),
DELETE("del", "已删除");
DELETE("del", "已删除"),
FIRST_SIGNING("0", "首次签约"),
RENEWAL("1", "续约"),
SUPPLEMENTARY_AGREEMENT("2", "补充协议"),
BLANK("", "");
private String key;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment