reset interface

rej-reex/app/base/controller/impl/rejreex/agentCtl.js

-var system = require("../../../system")
-const CtlBase = require("../../ctl.base");
-class AgentCtl extends CtlBase {
-  constructor() {
-    super("rejreex", CtlBase.getServiceName(AgentCtl));
-  }
-
-  async getAgentOfCase (pobj, qobj, req) {
-    try {
-      let caseId = pobj.caseId
-      let result = await this.service.getOfCase(caseId)
-      return system.getResultSuccess(result)
-    } catch (error) {
-      console.log('err: ', error)
-      return system.getResultFail(error.message)
-    }
-  }
-}
-module.exports = AgentCtl;
\ No newline at end of file

rej-reex/app/base/controller/impl/rejreex/trademarkcaseCtl.js

@@ -32,7 +32,7 @@ class TrademarkcaseCtl extends CtlBase {
     }
   }
 
-  async getCaseList (pobj, qobj, req) {
+  async findAndCountAll (pobj, qobj, req) {
     try {
       let result = await this.service.getCaseList(pobj)
       return system.getResultSuccess(result)

rej-reex/app/base/db/impl/common/connection.js

@@ -32,9 +32,6 @@ class DbFactory {
     this.db.models.user.belongsToMany(this.db.models.role, { as: "Roles", through: 'p_userrole', constraints: false, });
     this.db.models.role.belongsToMany(this.db.models.user, { as: "Users", through: 'p_userrole', constraints: false, });
     
-    /* 案例 代理人 申请人 */
-    this.db.models.trademarkcase.hasMany(this.db.models.agent, { sourceKey: 'caseId', foreignKey: 'caseId' })
-    this.db.models.trademarkcase.hasMany(this.db.models.applicant, {  sourceKey: 'caseId', foreignKey: 'caseId' })
     /*组织机构自引用*/
     //this.db.models.org.belongsTo(this.db.models.org,{constraints: false,});
     //this.db.models.org.hasMany(this.db.models.org,{constraints: false,});

rej-reex/app/base/db/impl/rejreex/agentDao.js

-const system=require("../../../system");
-const Dao=require("../../dao.base");
-class AgentDao extends Dao{
-  constructor(){
-    super(Dao.getModelName(AgentDao));
-  }
-  extraWhere(qobj,qw,qc){
-    qc.raw=true;
-    return qw;
-  }
-}
-module.exports=AgentDao;

rej-reex/app/base/db/impl/rejreex/applicantDao.js

-const system=require("../../../system");
-const Dao=require("../../dao.base");
-class ApplicantDao extends Dao{
-  constructor(){
-    super(Dao.getModelName(ApplicantDao));
-  }
-  extraWhere(qobj,qw,qc){
-    qc.raw=true;
-    return qw;
-  }
-}
-module.exports=ApplicantDao;

rej-reex/app/base/db/impl/rejreex/trademarkcaseDao.js

-const system=require("../../../system");
-const Dao=require("../../dao.base");
-class TrademarkcaseDao extends Dao{
-  constructor(){
+const system = require("../../../system");
+const Dao = require("../../dao.base");
+class TrademarkcaseDao extends Dao {
+  constructor() {
     super(Dao.getModelName(TrademarkcaseDao));
   }
-  extraWhere(qobj,qw,qc){
-    qc.raw=true;
+  extraWhere (qobj, qw, qc, linkAttrs) {
+    // console.log("qobj", qobj)
+    // console.log("qw", qw)
+    // console.log("qc", qc)
+    // console.log("linkarr", linkAttrs)
+    qc.order.unshift(['v_noticeDate', 'DESC'])
+    switch (qobj.bizpath) {
+      case '/dealaskfor/examine':
+        qw.tradeStatus = '待审核'
+        break
+    }
+    qc.raw = true;
     return qw;
   }
 }
-module.exports=TrademarkcaseDao;
+module.exports = TrademarkcaseDao;

rej-reex/app/base/db/models/rejreex/models/agent.js

-/* jshint indent: 2 */
-
-module.exports = function(sequelize, DataTypes) {
-  return sequelize.define('agent', {
-    agent: DataTypes.STRING,
-    assistant: DataTypes.STRING,
-    input: DataTypes.STRING,
-    business: DataTypes.STRING,
-    receiveDate: DataTypes.DATE,
-    pushDate: DataTypes.DATE,
-    caseId: DataTypes.STRING,
-  }, {
-    paranoid: true,
-    underscored: true,
-    timestamps: true,
-    version: true,
-    freezeTableName: true,
-    tableName: 'agent'
-  });
-};

rej-reex/app/base/db/models/rejreex/models/applicant.js

-/* jshint indent: 2 */
-
-module.exports = function (sequelize, DataTypes) {
-  return sequelize.define('applicant', {
-    region: DataTypes.STRING,
-    regionCode: DataTypes.STRING,
-    idCard: DataTypes.STRING,
-    companyName: DataTypes.STRING,
-    companyNameEn: DataTypes.STRING,
-    companyAddr: DataTypes.STRING,
-    companyAddrEn: DataTypes.STRING,
-    contactsName: DataTypes.STRING,
-    contactsAddr: DataTypes.STRING,
-    contactsMobileNum: DataTypes.STRING,
-    mail: DataTypes.STRING,
-    mailCode: DataTypes.STRING,
-    caseId: DataTypes.STRING,
-  }, {
-    paranoid: true,
-    underscored: true,
-    timestamps: true,
-    version: true,
-    freezeTableName: true,
-    tableName: 'applicant'
-  });
-};

rej-reex/app/base/db/models/rejreex/models/trademarkcase.js

-module.exports = function(sequelize, DataTypes) {
+module.exports = function (sequelize, DataTypes) {
   return sequelize.define('trademarkcase', {
     caseId: DataTypes.STRING,
     orderId: DataTypes.STRING,
-    tmName: DataTypes.STRING,
-    enTmName: DataTypes.STRING,
     askforId: DataTypes.STRING,
-    sAskforId: DataTypes.STRING,
-    askforDir: DataTypes.STRING,
-    tmType: DataTypes.INTEGER,
-    isDefer: DataTypes.INTEGER,
-    askforDate: DataTypes.DATE,
-    isCommonAskfor: DataTypes.INTEGER,
-    isNeedEvidence: DataTypes.INTEGER,
-    TODNum: DataTypes.STRING,
-    caseType: DataTypes.STRING,
-    caseStatus: DataTypes.STRING,
-    rdDate: DataTypes.DATE,
-    askforCompany: DataTypes.STRING,
-    proxyName: DataTypes.STRING,
+    tradeType: DataTypes.INTEGER,
+    tradeImg: DataTypes.STRING,
+    tradeStatus: DataTypes.STRING,
+    returnReason: DataTypes.STRING,
+    usccode: DataTypes.STRING,
+    agentName: DataTypes.STRING,
+    trademarkRejInfo: DataTypes.JSON,
+    applicant: DataTypes.JSON,
+    askForData: DataTypes.JSON,
+    supData: DataTypes.JSON,
+    offical: DataTypes.JSON,
+    v_noticeDate: DataTypes.DATE,
+    v_applicantName: DataTypes.STRING
   }, {
     paranoid: true,
     underscored: true,

rej-reex/app/base/service/impl/rejreex/agentSve.js

-const system = require("../../../system");
-const ServiceBase = require("../../sve.base");
-class AgentService extends ServiceBase {
-  constructor() {
-    super("rejreex", ServiceBase.getDaoName(AgentService))
-  }
-
-  async getOfCase (id) {
-    return await this.dao.findOne({ caseId: id })
-  }
-}
-module.exports = AgentService;

rej-reex/app/config/settings.js

@@ -16,7 +16,7 @@ var settings = {
   salt: "%iatpD1gcxz7iF#B",
   defaultpwd: "gsb2020",
   basepath: path.normalize(path.join(__dirname, '../..')),
-  port: process.env.NODE_PORT || 8888,
+  port: process.env.NODE_PORT || 8777,
   kongurl: function () {
     if (this.env == "dev") {
       var localsettings = require("./localsettings");