fix

src/dashoo.cn/backend/api/business/oilcontract/contract/contractService.go

@@ -55,7 +55,7 @@ func (s *OilContractService) GetHandOnStatisticsList (queryParam HandOnStatistic
 
 }
 
-func (s *OilContractService) GetSum(entitiesPtr interface{}, where string) {
+func (s *OilContractService) GetSum1(entitiesPtr interface{}, where string) {
 
 	sql := ` select sum(Money) as Money from OilContractMoney`
 	sql += ` where ` + where

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

@@ -275,7 +275,7 @@ func (this *OilInvoiceController) UpdateIsInvoice() {
 	//	"','kptype':'1','message':'','payee':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople1") + "','checker':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople2") +
 	//	"','tsfs':'1','email':'" + entity.Email + "','qdbz':'0','qdxmmc':'','dkbz':'0','deptid':'','clerkid':'','invoiceLine':'p','cpybz':'','detail':["+paramsString+"]}}"
 
-	fmt.Println(string(paramsStr), "参数")
+	fmt.Println(string(paramsStr), "诺诺参数")
 	invoiceJson := invoice.Post(url, string(paramsStr), key)
 	fmt.Println(invoiceJson, "诺诺接口返回")
 	if invoiceJson.Status != "0000"{

src/dashoo.cn/backend/api/controllers/oilcontract/contract.go

@@ -1188,7 +1188,7 @@ func (this *OilContractController) CountMoney() {
 
 	var model contract.OilContractMoney
 	svc := contract.GetOilContractService(utils.DBE)
-	svc.GetSum(&model, "Year != '"+time.Now().Format("2006")+"'")
+	svc.GetSum1(&model, "ContractId = " + Id + " and Year != '"+time.Now().Format("2006")+"'")
 	this.Data["json"] = &model
 	this.ServeJSON()
 }
@@ -1267,3 +1267,38 @@ func (this *OilContractController) DeleteList() {
 	this.Data["json"] = &errinfo
 	this.ServeJSON()
 }
+
+// @Title 一键更新二级单位名称
+// @Description
+// @Success 200 {object} ErrorInfo
+// @router /updateUnitName/:Id [get]
+func (this *OilContractController) UpdateUnitName() {
+	Id := this.Ctx.Input.Param(":Id")
+	UnitId := this.GetString("UnitId")
+	ContractId := this.GetString("ContractId")
+	var errinfo ErrorInfo
+	if Id == "" || UnitId == ""{
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var model contract.OilContract
+	svc := contract.GetOilContractService(utils.DBE)
+	var org organize.Base_Organize
+	svc.GetEntityByWhere("Base_Organize", "Id = " + UnitId, &org)
+
+	model.SecondUnit ,_= strconv.Atoi(UnitId)
+	model.SecondUnitName = org.Fullname
+	where := "SecondUnit = " + Id
+	if ContractId != "" {
+		where += " and Id = " + ContractId
+	}
+	svc.UpdateEntityBywheretbl(OilContractName, &model, []string{"SecondUnit", "SecondUnitName"}, where)
+	errinfo.Message = "更新成功"
+	errinfo.Code = 0
+	this.Data["json"] = &errinfo
+	this.ServeJSON()
+}

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

@@ -1192,6 +1192,14 @@ func (this *AnnualAuditController) DeleteEntity() {
 
 	err := svc.DeleteOperationAndWriteLogBytbl(""+OilAnnualAuditName, BaseOperationLogName, Id, &model, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, "", "钻井日报")
 	if err == nil {
+		activitiService := workflow.GetActivitiService(utils.DBE)
+		var deleteProcessVM workflow.DeleteProcessVM
+		if model.WorkflowId != "" && model.WorkflowId != "0" {
+			deleteProcessVM.ProcessInstanceId = model.WorkflowId
+			deleteProcessVM.DeleteReason = "审批未通过，被申请人删除"
+			activitiService.DeleteComplete(deleteProcessVM)
+		}
+
 		errinfo.Message = "删除成功"
 		errinfo.Code = 0
 		this.Data["json"] = &errinfo

src/dashoo.cn/frontend_web/src/api/oilcontract/contract.js

@@ -260,5 +260,12 @@ export default {
       method: 'post',
       params: params
     })
-  }
+  },
+  updateUnitName (unitId, params, myAxios) {
+    return myAxios({
+      url: '/contract/updateUnitName/' + unitId,
+      method: 'get',
+      params: params
+    })
+  },
 }

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/_opera/operation.vue

@@ -17,6 +17,7 @@
           <el-button type="primary" size="mini" v-if="succseButton && formData.Id!=0 && ![1, 2, 3].includes(formData.Status)" @click="onFinish">完结</el-button>
           <el-button type="primary" size="mini" v-if="successBoolean" @click="exportExcel">导出</el-button>
           <el-button type="primary" size="mini" :loading="addloading" @click="saveEntity">保存</el-button>
+          <el-button type="primary" size="mini" @click="updateName">修改二级单位</el-button>
           <router-link :to="'/oilcontract/contract-import'">
             <el-button type="primary" size="mini" plain style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -413,7 +414,7 @@
       <div slot="header" class="clearfix">
         <span>跨年记录</span>
       </div>
-      <el-form id="rebateSetTable1" label-width="110px" ref="EntityForm" :rules="rules" :model="formData"
+      <el-form id="rebateSetTable1" label-width="110px" :model="formData"
                class="fromClass web_fromclass">
         <el-row>
           <el-col :span="8">
@@ -454,6 +455,37 @@
       </el-form>
     </el-card>
 
+    <el-dialog
+      title="修改二级单位"
+      :visible.sync="dialogVisibleContract"
+      :close-on-click-modal="false"
+      width="50%">
+      <el-form :model="formData" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="20">
+            <el-form-item label="二级单位" prop="SecondUnitName">
+              <el-input v-model="formData.SecondUnitName" placeholder="请输入" style="width: 50%" readonly></el-input>
+            </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="20">
+            <el-form-item label="新二级单位" prop="SecondUnitName">
+              <el-select filterable ref="issueFromSelect" v-model="NewUnitId" class="select_form"
+                         placeholder="请选择二级单位" style="width: 50%;">
+                <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                           style="width: 100%;"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div style="display: flex;justify-content: flex-end;margin-top: 16px;">
+        <el-button type="primary" :loading="updateLoading" size="mini" @click="updateUnitName(1)">修改</el-button>
+        <el-button type="primary" :loading="updateLoading1" size="mini" @click="updateUnitName()">批量修改</el-button>
+      </div>
+    </el-dialog>
 
 <!--    <el-dialog-->
 <!--      title="下发工单"-->
@@ -545,6 +577,9 @@ export default {
       issueFrom: {
         region: ''
       },
+      dialogVisibleContract: false,
+      updateLoading: false,
+      updateLoading1: false,
       orgOptions: [],
       issueVisible: false, // 下发弹窗
       issueRules: {
@@ -697,8 +732,11 @@ export default {
       activeName: '1',
       serviceId: '',
       CurrencyOptions: [],
+      NewUnitId: '',
       formData: {
         Id: '',
+        SecondUnitName: '',
+        SecondUnit: '',
         SupplierId: '',
         SupplierName: '',
         Status: 1,
@@ -945,6 +983,30 @@ export default {
       })
     },
 
+    // 保存信息
+    updateName () {
+      this.dialogVisibleContract = true
+    },
+    updateUnitName (val) {
+      if (val) {
+        this.updateLoading = true
+      } else {
+        this.updateLoading1 = true
+      }
+      let params = {
+        UnitId: this.NewUnitId,
+        ContractId: val ? this.formData.Id : ''
+      }
+      api.updateUnitName(this.formData.SecondUnit, params, this.$axios).then(res => {
+        this.$message({
+          type: 'success',
+          message: res.data.message
+        })
+        this.initDatas()
+        this.updateLoading = false
+        this.updateLoading1 = false
+      })
+    },
     // 保存信息
     saveEntity () {
       this.$refs['EntityForm'].validate((valid) => {

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/index.vue

@@ -764,6 +764,12 @@
             width: 100,
             sort: true
           },
+          {
+            prop: 'SecondUnitName',
+            label: '二级单位',
+            width: 100,
+            sort: true
+          },
 
           {
             prop: 'ProjectName',

src/dashoo.cn/frontend_web/src/pages/oilcontract/report/handon-statistics.vue

@@ -48,7 +48,7 @@
         <el-table-column sortable show-overflow-tooltip prop="HasNum" header-align="center" label="已上报数" width="150" align="center"></el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="HasNum" header-align="center" label="未上报数" width="150" align="center">
           <template slot-scope="scope">
-            {{ (scope.row.ContractNum - scope.row.HasNum) > 0 ? (scope.row.ContractNum - scope.row.HasNum) : '' }}
+            {{ (scope.row.ContractNum - scope.row.HasNum) > 0 ? (scope.row.ContractNum - scope.row.HasNum) : 0 }}
           </template>
         </el-table-column>
       </el-table>