* 修改操作不允许修改此字段
* 4. 司机
* 5. 楚和公司用户，可以查看管理全部砂站情况
+ * 6. 取土场客户
*/
@JSONField(name = "type")
public java.lang.Integer getType() {
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketInvalidVerify.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketInvalidVerify.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketInvalidVerify.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketInvalidVerify.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketLog.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketLog.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketLog.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketReceive.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketReceive.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketReceive.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketReceive.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTransfer.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTransfer.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTransfer.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTransfer.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTrash.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTrash.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTrash.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTrash.java
diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceLog.java
new file mode 100644
index 0000000..d5a33f3
--- /dev/null
+++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceLog.java
@@ -0,0 +1,302 @@
+package com.cowr.model.base;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.cowr.common.base.BaseModel;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by COWR Fri Apr 17 16:59:35 CST 2020
+ * TableName: trans_price_log
+ * Remarks: 系统配置 - 运费结算记录
+ *
+ * PrimaryKey: id
+ */
+@SuppressWarnings("serial")
+public abstract class BaseTransPriceLog> extends BaseModel implements IBean {
+
+ public static final String tablename = "trans_price_log";
+
+ @JSONField(serialize = false)
+ public String getTablename() {
+ return tablename;
+ }
+
+ /**
+ * name: id
+ * type: INT(10)
+ * isNullable: NO
+ * isPrimaryKey: YES
+ * defaultValue:
+ *
+ * @param id
+ */
+ @JSONField(name = "id")
+ public void setId(Integer id) {
+ set("id", id);
+ }
+
+
+ /**
+ * @return id
+ */
+ @JSONField(name = "id")
+ public Integer getId() {
+ return getInt("id");
+ }
+
+
+ /**
+ * name: trans_co_id
+ * type: INT(10)
+ * isNullable: YES
+ * isPrimaryKey: NO
+ * defaultValue:
+ *
+ * @param transCoId 物流公司
+ */
+ @JSONField(name = "trans_co_id")
+ public void setTransCoId(Integer transCoId) {
+ set("trans_co_id", transCoId);
+ }
+
+
+ /**
+ * @return trans_co_id 物流公司
+ */
+ @JSONField(name = "trans_co_id")
+ public Integer getTransCoId() {
+ return getInt("trans_co_id");
+ }
+
+ /**
+ * name: trans_co_name
+ * type: VARCHAR(128)
+ * isNullable: YES
+ * isPrimaryKey: NO
+ * defaultValue:
+ *
+ * @param transCoName
+ */
+ @JSONField(name = "trans_co_name")
+ public void setTransCoName(String transCoName) {
+ set("trans_co_name", transCoName);
+ }
+
+
+ /**
+ * @return trans_co_name
+ */
+ @JSONField(name = "trans_co_name")
+ public String getTransCoName() {
+ return getStr("trans_co_name");
+ }
+
+
+ /**
+ * name: trans_name
+ * type: varchar(15)
+ * isNullable: YES
+ * isPrimaryKey: NO
+ * defaultValue:
+ *
+ * @param transName 联系人姓名
+ */
+ @JSONField(name = "trans_name")
+ public void setTransName(String transName) {
+ set("trans_name", transName);
+ }
+
+
+ /**
+ * @return trans_name 联系人姓名
+ */
+ @JSONField(name = "trans_name")
+ public String getTransName() {
+ return getStr("trans_name");
+ }
+
+ /**
+ * name: trans_phone
+ * type: VARCHAR(128)
+ * isNullable: YES
+ * isPrimaryKey: NO
+ * defaultValue:
+ *
+ * @param transPhone
+ */
+ @JSONField(name = "trans_phone")
+ public void setTransPhone(String transPhone) {
+ set("trans_phone", transPhone);
+ }
+
+
+ /**
+ * @return trans_co_name
+ */
+ @JSONField(name = "trans_phone")
+ public String getTransPhone() {
+ return getStr("trans_phone");
+ }
+
+ /**
+ * name: settlement_dates
+ * type: VARCHAR(128)
+ * isNullable: YES
+ * isPrimaryKey: NO
+ * defaultValue:
+ *
+ * @param v
+ */
+ @JSONField(name = "settlement_dates")
+ public void setSettlementDates(String v) {
+ set("settlement_dates", v);
+ }
+
+
+ /**
+ * @return trans_co_name
+ */
+ @JSONField(name = "settlement_dates")
+ public String getSettlementDates() {
+ return getStr("settlement_dates");
+ }
+
+
+ /**
+ * name: bank_sn
+ * type: VARCHAR(128)
+ * isNullable: YES
+ * isPrimaryKey: NO
+ * defaultValue: 流水号
+ *
+ * @param v
+ */
+ @JSONField(name = "bank_sn")
+ public void setBankSn(String v) {
+ set("bank_sn", v);
+ }
+
+
+ /**
+ * @return bank_sn
+ */
+ @JSONField(name = "bank_sn")
+ public String getBankSn() {
+ return getStr("bank_sn");
+ }
+
+
+ /**
+ * name: bank_name
+ * type: VARCHAR(128)
+ * isNullable: YES
+ * isPrimaryKey: NO
+ * defaultValue:
+ *
+ * @param v
+ */
+ @JSONField(name = "bank_name")
+ public void setBankName(String v) {
+ set("bank_name", v);
+ }
+
+
+ /**
+ * @return bank_name
+ */
+ @JSONField(name = "bank_name")
+ public String getBankName() {
+ return getStr("bank_name");
+ }
+
+
+ /**
+ * name: del
+ * type: INT(10)
+ * isNullable: NO
+ * isPrimaryKey: NO
+ * defaultValue: 0
+ *
+ * @param del 逻辑删除标志
+ */
+ @JSONField(name = "del")
+ public void setDel(java.lang.Integer del) {
+ set("del", del);
+ }
+
+
+ /**
+ * @return del 逻辑删除标志
+ */
+ @JSONField(name = "del")
+ public java.lang.Integer getDel() {
+ return getInt("del");
+ }
+ /**
+ * name: pay_date
+ * type: DATETIME(19)
+ * isNullable: NO
+ * isPrimaryKey: NO
+ * defaultValue: CURRENT_TIMESTAMP
+ * @param createTime 付款时间
+ */
+ @JSONField(name="pay_date")
+ public void setPayDate(java.util.Date createTime) {
+ set("pay_date", createTime);
+ }
+
+
+ /**
+ * @return create_time 创建时间
+ */
+ @JSONField(name="pay_date")
+ public java.util.Date getPayDate() {
+ return get("pay_date");
+ }
+
+ /**
+ * name: create_time
+ * type: DATETIME(19)
+ * isNullable: NO
+ * isPrimaryKey: NO
+ * defaultValue: CURRENT_TIMESTAMP
+ * @param createTime 创建时间
+ */
+ @JSONField(name="create_time")
+ public void setCreateTime(java.util.Date createTime) {
+ set("create_time", createTime);
+ }
+
+
+ /**
+ * @return create_time 创建时间
+ */
+ @JSONField(name="create_time")
+ public java.util.Date getCreateTime() {
+ return get("create_time");
+ }
+
+ /**
+ * name: memo
+ * type: VARCHAR(20)
+ * isNullable: YES
+ * isPrimaryKey: NO
+ * defaultValue:
+ * @param memo 单位
+ */
+ @JSONField(name="memo")
+ public void setMemo(String memo) {
+ set("memo", memo);
+ }
+
+
+ /**
+ * @return memo 备注
+ */
+ @JSONField(name="memo")
+ public String getMemo() {
+ return getStr("memo");
+ }
+
+
+}
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransport.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransport.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransport.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransport.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java
similarity index 77%
rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java
index fd45ab1..2d56c74 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java
+++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java
@@ -65,6 +65,28 @@ public abstract class BaseTransportCompany> ex
public java.lang.String getName() {
return getStr("name");
}
+ /**
+ * name: contact
+ * type: VARCHAR(128)
+ * isNullable: NO
+ * isPrimaryKey: NO
+ * defaultValue:
+ *
+ * @param contact
+ */
+ @JSONField(name = "contact")
+ public void setContact(java.lang.String contact) {
+ set("contact", contact);
+ }
+
+
+ /**
+ * @return contact
+ */
+ @JSONField(name = "contact")
+ public java.lang.String getContact() {
+ return getStr("contact");
+ }
/**
* name: lgtd
@@ -320,4 +342,74 @@ public abstract class BaseTransportCompany> ex
}
+ /**
+ * name: create_id
+ * type: INT UNSIGNED(10)
+ * isNullable: NO
+ * isPrimaryKey: NO
+ * defaultValue:
+ * @param createId 用户id
+ */
+ @JSONField(name="create_id")
+ public void setCreateId(Integer createId) {
+ set("create_id", createId);
+ }
+
+
+ /**
+ * @return create_id 用户id
+ */
+ @JSONField(name="create_id")
+ public Integer getCreateId() {
+ return getInt("create_id");
+ }
+
+
+ /**
+ * name: create_time
+ * type: TIMESTAMP(19)
+ * isNullable: NO
+ * isPrimaryKey: NO
+ * defaultValue: CURRENT_TIMESTAMP
+ *
+ * @param createTime 最后修改时间
+ */
+ @JSONField(name = "create_time")
+ public void setCreateTime(java.util.Date createTime) {
+ set("create_time", createTime);
+ }
+
+
+ /**
+ * @return create_time 最后修改时间
+ */
+ @JSONField(name = "create_time")
+ public java.util.Date getCreateTime() {
+ return get("create_time");
+ }
+
+
+ /**
+ * name: update_time
+ * type: DATETIME(19)
+ * isNullable: NO
+ * isPrimaryKey: NO
+ * defaultValue: CURRENT_TIMESTAMP
+ * @param updateTime 更新时间
+ */
+ @JSONField(name="update_time")
+ public void setUpdateTime(java.util.Date updateTime) {
+ set("update_time", updateTime);
+ }
+
+
+ /**
+ * @return update_time 更新时间
+ */
+ @JSONField(name="update_time")
+ public java.util.Date getUpdateTime() {
+ return get("update_time");
+ }
+
+
}
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruck.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruck.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruck.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruck.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/sms/AliyunSmsService.java b/ssjygl-xsct-common/src/main/java/com/cowr/sms/AliyunSmsService.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/sms/AliyunSmsService.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/sms/AliyunSmsService.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/CacheData.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/CacheData.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/CacheData.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/CacheData.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java
similarity index 100%
rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java
diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java
similarity index 96%
rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java
rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java
index 14135db..2759bae 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java
+++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java
@@ -48,9 +48,8 @@ public class ActionCmdLogService {
public Page findRodLog(PageParam pp, String create_user_name, String stm, String etm) {
String selectsql = "select * ";
- String fromsql = "from action_cmd_log t where " +
- "AND t.cmd = 'rodUp'";
-// "t.content -> '$.cmd' = 'rodUp' ";
+ String fromsql = "from action_cmd_log t where t.content -> '$.cmd' = 'rodUp' ";
+
List