年审工作流修改

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

@@ -905,34 +905,31 @@ func (this *AnnualAuditController) AnnualAudit() {
 		step = 2
 		backstatus = suppliercert.NOPASS_STATUS
 	} else if list.Status == suppliercert.SECOND_TRIAL_STATUS {
-		status = suppliercert.THIRD_TRIAL_STATUS
+		status = suppliercert.PAYING_AUDIT_STATUS
 		step = 2
 		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
-		svc := organize.GetOrganizeService(utils.DBE)
-		//var users []userRole.Base_RoleList
-		//supsvc.GetAuditUser(strconv.Itoa(list.ThirdAudit), workflow.PROF_RECE, &users)
-		//paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
-		//topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
-		unitId := svc.GetMyUnitDepartmentId(strconv.Itoa(list.ThirdAudit))
-		var userlist []userRole.Base_User
-		var setting auditsetting.Base_OilAuditSetting
-		usvc := userRole.GetUserService(utils.DBE)
-		where := "AuditStepCode='" + workflow.PROF_RECE + "'"
-		svc.GetEntity(&setting, where)
-		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 + ")" + " and UnitId=" + unitId
-			svc.GetEntities(&userlist, where)
-		}
-
 
-		for _, tmpUser := range userlist {
-			userIds += strconv.Itoa(tmpUser.Id) + ","//strconv.FormatInt(tmpUser.Id, 10) + ","
-		}
-		userIds = strings.Trim(userIds, ",")
+		//svc := organize.GetOrganizeService(utils.DBE)
+		//unitId := svc.GetMyUnitDepartmentId(strconv.Itoa(list.ThirdAudit))
+		//var userlist []userRole.Base_User
+		//var setting auditsetting.Base_OilAuditSetting
+		//usvc := userRole.GetUserService(utils.DBE)
+		//where := "AuditStepCode='" + workflow.PROF_RECE + "'"
+		//svc.GetEntity(&setting, where)
+		//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 + ")" + " and UnitId=" + unitId
+		//	svc.GetEntities(&userlist, where)
+		//}
+		//
+		//
+		//for _, tmpUser := range userlist {
+		//	userIds += strconv.Itoa(tmpUser.Id) + ","//strconv.FormatInt(tmpUser.Id, 10) + ","
+		//}
+		//userIds = strings.Trim(userIds, ",")
 	} else if list.Status == suppliercert.THIRD_TRIAL_STATUS {
 		userIds = ProfAudit
 		status = suppliercert.PROF_AUDIT_STATUS
@@ -956,7 +953,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 		var auditmodel annualaudit.OilAnnualAudit
 		auditmodel.Status = status
 		oldaplydate := list.ApplyTime
-		if list.Status == suppliercert.PROF_AUDIT_STATUS {
+		if list.Status == suppliercert.SECOND_TRIAL_STATUS {
 
 			if certEntity.InStyle == "1" {
 				var certmodel suppliercert.OilSupplierCert

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

@@ -267,7 +267,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 		} else if wfName == workflow.OIL_AUDIT_APPLY {
 			//年审
 			where := " 1=1 "
-			where = where + " and b.Id = '" + id + "'"
+			where = where + " and Id = '" + id + "'"
 			var todo todolist.TodoList
 			var listannu annualaudit.OilAnnualAudit
 			svc := annualaudit.GetOilAnnualAuditService(utils.DBE)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -253,11 +253,11 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室">
-              <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
-                           style="width: 100%" v-model="majorDept" placeholder="请选择专业处室" @change="orgtreeChange">
-              </el-cascader>
-            </el-form-item>
+            <!--<el-form-item label="专业处室">-->
+              <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
+                           <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室" @change="orgtreeChange">-->
+              <!--</el-cascader>-->
+            <!--</el-form-item>-->
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注">
@@ -487,7 +487,7 @@
       this.getorgtreelist()
       this.getannualdata()
       // this.getorgtreelistbydeptid()
-      this.orgtreeChange(this.majorDept)
+      // this.orgtreeChange(this.majorDept)
     },
     methods: {
       fenbanBtn () {
@@ -811,20 +811,20 @@
             })
             return
           }
-          if (this.majorDept.length === 0) {
-            this.$message({
-              type: 'warning',
-              message: '请选择专业处室！'
-            })
-            return
-          }
-          if (this.userOptions.length === 0) {
-            this.$message({
-              type: 'warning',
-              message: '该专业科室未配置接收人！'
-            })
-            return
-          }
+          // if (this.majorDept.length === 0) {
+          //   this.$message({
+          //     type: 'warning',
+          //     message: '请选择专业处室！'
+          //   })
+          //   return
+          // }
+          // if (this.userOptions.length === 0) {
+          //   this.$message({
+          //     type: 'warning',
+          //     message: '该专业科室未配置接收人！'
+          //   })
+          //   return
+          // }
         } else {
           if (this.shenheForm.SuccessStatus === 1) {
             if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3') {