前后:主要页面列表加序号;港信通提醒

src/dashoo.cn/backend/api/business/todolist/todolist.go

@@ -18,6 +18,24 @@ type TodoList struct {
 	CreateTime       int64
 }
 
+type SendVM struct {
+	Id               int    `xorm:"int(11)"`
+	SupplierId       string `xorm:"VARCHAR(30)"`
+	CertId           string `xorm:"VARCHAR(30)"`
+	QualId           string `xorm:"VARCHAR(30)"`
+	BusinessKey      string `xorm:"VARCHAR(30)"`
+	SupplierTypeCode string `xorm:"VARCHAR(30)"`
+	Type             string `xorm:"VARCHAR(10)"` // 1 准入 2 增项 3 年审 4 信息变更 5 资质变更
+	SupplierName     string `xorm:"VARCHAR(50)"`
+	UserName         string `xorm:"VARCHAR(50)"`
+	TaskName         string `xorm:"VARCHAR(50)"`
+	Status           string `xorm:"VARCHAR(50)"`
+	WorkflowId       string `xorm:"VARCHAR(50)"`
+	AnnualId         string `xorm:"VARCHAR(50)"`
+	Step             string `xorm:"VARCHAR(50)"`
+	CreateTime       int64
+}
+
 const (
 	SUPPLIER    string = "1" // 准入
 	CERTAPPEND  string = "2" // 增项

src/dashoo.cn/backend/api/controllers/oilsupplier/todolist.go

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/invoiceinfo"
 	"dashoo.cn/backend/api/business/oilcontract/contract"
 	"dashoo.cn/backend/api/business/oilcontract/contractReview"
@@ -14,8 +15,10 @@ import (
 	"dashoo.cn/backend/api/business/register"
 	"dashoo.cn/backend/api/business/todolist"
 	"dashoo.cn/backend/api/business/workflow"
+	"dashoo.cn/business2/userRole"
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
+	"encoding/json"
 	"fmt"
 	"sort"
 	"strconv"
@@ -593,9 +596,53 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 	this.ServeJSON()
 }
 
-// @Title 获取待办发港信通提醒
+// @Title 获取待办-发港信通提醒
 // @Description get user by token
 // @Success 200 {object} []supplier.OilSupplierView
 // @router /getToDoSend [get]
 func (this *TodoListController) GetToDoSend() {
+	page := this.GetPageInfoForm()
+
+	supplierTypeCode := this.GetString("SupplierTypeCode")
+	supplierName := this.GetString("SupplierName")
+	wfNames := ""
+
+	var pagingResult workflow.ActiMyPagingResultVM
+	var myTasksRetWithTimes []workflow.ActiMyTasksRetWithTimeVM
+	actisvc := workflow.GetActivitiService(utils.DBE)
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
+
+	var userList []userRole.Base_User
+	var settingList []auditsetting.Base_OilAuditSetting
+	usvc := userRole.GetUserService(utils.DBE)
+	usvc.GetEntities(&settingList, "1=1")
+
+	tempstr := ""
+	for _,setting := range settingList {
+		ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+		tempstr += "," + strings.Join(ids, ",")
+	}
+	uids := strings.Replace(tempstr, "uid_", "", -1)
+	uids = strings.Trim(uids, ",")
+	if uids != "" {
+		where := "Id in (" + uids + ")"
+		usvc.GetEntities(&userList, where)
+	}
+	for _,user := range userList {
+		pagingResult = actisvc.GetMyAllTypePagingTasksWithTime(strconv.Itoa(user.Id), page.CurrentPage, page.Size, wfNames, supplierTypeCode, supplierName)
+		myTasksRetWithTimes = pagingResult.TaskList
+		if len(myTasksRetWithTimes) > 0 {
+			var sendVM todolist.SendVM
+			//wordTempVM.Datas = datas
+			//wordTempVM.TemplateUrl = templateUrl
+			//wordTempVM.FileName = fileName
+			jsonParam, err := json.Marshal(sendVM)
+			if err != nil {
+				fmt.Println(err, "生成json字符串错误")
+			}
+			params := string(jsonParam)
+			svcActiviti.PostOrigin("/v1.0/send-sys-msg", params, "")
+		}
+	}
+
 }

src/dashoo.cn/backend/api/controllers/toolbox/toolbox.go

@@ -70,11 +70,11 @@ func TimingTask(){
 	toolbox.AddTask("myTaskInvoiceStatus", tkInvoiceStatus)
 
 	// 有待办调港信通
-	//tkToDo := toolbox.NewTask("myTaskToDo", "0 0 2 * * *", func() error {
-	//	todo.GetToDoSend()
-	//	return nil
-	//})
-	//toolbox.AddTask("myTaskToDo", tkToDo)
+	tkToDo := toolbox.NewTask("myTaskToDo", "0 0 2 * * *", func() error {
+		//todo.GetToDoSend()
+		return nil
+	})
+	toolbox.AddTask("myTaskToDo", tkToDo)
 
 	toolbox.StartTask()
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/basislist.vue

@@ -45,7 +45,11 @@
             </router-link>
           </template>
         </el-table-column>
-
+        <el-table-column align="center" width="70" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column min-width="110" align="center" prop="Status" label="审核状态" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/goodslist.vue

@@ -45,6 +45,11 @@
             </router-link>
           </template>
         </el-table-column>
+        <el-table-column align="center" width="70" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column min-width="110" align="center" prop="Status" label="审核状态" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/index.vue

@@ -62,6 +62,11 @@
             </router-link>
           </template>
         </el-table-column>
+        <el-table-column align="center" width="70" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column min-width="110" align="center" prop="Status" label="审核状态" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/techlist.vue

@@ -46,7 +46,11 @@
 
           </template>
         </el-table-column>
-
+        <el-table-column align="center" width="70" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column min-width="110" align="center" prop="Status" label="审核状态" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/basislist.vue

@@ -62,6 +62,11 @@
             <!--</el-popover>-->
           </template>
         </el-table-column>
+        <el-table-column align="center" width="70" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column min-width="110" align="center" prop="InFlag" label="准入标识" sortable show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.InFlag=='1'" style="color:#67C23A">准入</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/goodslist.vue

@@ -63,6 +63,11 @@
             <!--</el-popover>-->
           </template>
         </el-table-column>
+        <el-table-column align="center" width="70" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column min-width="110" align="center" prop="InFlag" label="准入标识" sortable show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.InFlag=='1'" style="color:#67C23A">准入</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/index.vue

@@ -66,6 +66,11 @@
             <!--</el-popover>-->
           </template>
         </el-table-column>
+        <el-table-column align="center" width="70" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column min-width="110" align="center" prop="InFlag" label="准入标识" sortable show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.InFlag=='1'" style="color:#67C23A">准入</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/techlist.vue

@@ -62,6 +62,11 @@
             <!--</el-popover>-->
           </template>
         </el-table-column>
+        <el-table-column align="center" width="70" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column width="100" align="center" prop="InFlag" label="准入标识" sortable show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.InFlag=='1'" style="color:#67C23A">准入</span>

src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -111,6 +111,11 @@
                           fixed="left">
         </el-table-column>
         <!--内框表格剩余栏显示-->
+        <el-table-column align="center" width="70" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column label="状态" prop="InFlag" width="100px" align="center" sortable>
           <template slot-scope="scope">
             <el-alert

src/dashoo.cn/frontend_web/src/pages/select/processselect/index.vue

@@ -51,6 +51,11 @@
         <el-tab-pane label="全部" name="all">
           <el-table highlight-current-row stripe :data="entityListAll" v-loading="loading" id="rebateSetTable0" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
             <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
+            <el-table-column align="center" width="70" label="序号">
+              <template slot-scope="scope">
+                <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+              </template>
+            </el-table-column>
             <el-table-column label="准入编码" show-tooltip-when-overflow prop="AccessCardNo" align="center" width="110px">
               <template slot-scope="scope" >
                 <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
@@ -98,6 +103,11 @@
         <el-tab-pane label="准入" name="first">
           <el-table highlight-current-row :data="entityList" v-loading="loading" id="rebateSetTable1" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
             <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
+            <el-table-column align="center" width="70" label="序号">
+              <template slot-scope="scope">
+                <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+              </template>
+            </el-table-column>
             <el-table-column label="准入编码" prop="AccessCardNo" align="center">
               <template slot-scope="scope" >
                 <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
@@ -140,6 +150,11 @@
         <el-tab-pane label="增项" name="second">
           <el-table highlight-current-row :data="entityList1" v-loading="loading" id="rebateSetTable2" size="mini"  border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
             <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
+            <el-table-column align="center" width="70" label="序号">
+              <template slot-scope="scope">
+                <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+              </template>
+            </el-table-column>
             <el-table-column label="准入编码" prop="AccessCardNo" align="center">
               <template slot-scope="scope" >
                 <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
@@ -182,6 +197,11 @@
         <el-tab-pane label="年审" name="third">
           <el-table highlight-current-row :data="entityList2" v-loading="loading" id="rebateSetTable3" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
             <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
+            <el-table-column align="center" width="70" label="序号">
+              <template slot-scope="scope">
+                <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+              </template>
+            </el-table-column>
             <el-table-column label="准入编码" prop="AccessCardNo" align="center">
               <template slot-scope="scope" >
                 <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
@@ -224,6 +244,11 @@
         <el-tab-pane label="变更申请" name="fourth">
           <el-table highlight-current-row :data="entityList3" v-loading="loading" id="rebateSetTable4" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
             <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
+            <el-table-column align="center" width="70" label="序号">
+              <template slot-scope="scope">
+                <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+              </template>
+            </el-table-column>
             <el-table-column label="准入编码" prop="AccessCardNo" align="center">
               <template slot-scope="scope" >
                 <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>