LY 工作票 bugfix

master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -15,6 +15,7 @@ import com.ruoyi.project.ehs.domain.TJobticket;
 import com.ruoyi.project.ehs.mapper.TJobticketMapper;
 import com.ruoyi.project.ehs.service.ITJobticketService;
 import com.ruoyi.project.invoice.domain.TInvoiceWorkcontent;
+import com.ruoyi.project.invoice.mapper.TInvoiceWorkcontentMapper;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.domain.SysUser;
@@ -57,6 +58,9 @@ public class TJobticketController extends BaseController {
     @Resource
     private TJobticketMapper tJobticketMapper;
 
+    @Resource
+    private TInvoiceWorkcontentMapper invoiceWorkcontentMapper;
+
     /**
      * 查询工作票列表
      */
@@ -197,9 +201,14 @@ public class TJobticketController extends BaseController {
         StringBuilder contentUserUnit = new StringBuilder();
         int sameCount = 0;
         int nosanmeCount = 0;
+        int noCount = 0;
         List<SysDictData> book_user_unit = iSysDictTypeService.selectDictDataByType("book_user_unit");
         //批量插入时 需要查询数据库是否有重复数据 若果有 就不新增
         for (int i = 0; i < dto.size(); i++) {
+            if (StringUtils.isEmpty(dto.get(i).getGczyxkzh()) && StringUtils.isEmpty(dto.get(i).getDhzyxkzh()) && StringUtils.isEmpty(dto.get(i).getXzkjxkzh()) &&StringUtils.isEmpty(dto.get(i).getMbzyxkzh()) &&StringUtils.isEmpty(dto.get(i).getWhgzxkzh()) ) {
+                noCount ++;
+                continue;
+            }
             TJobticket tJobticket = new TJobticket();
             TInvoiceWorkcontent tInvoiceWorkcontent = dto.get(i);
             //部门应该是导入票数据来源的承包商的所属部门
@@ -242,14 +251,18 @@ public class TJobticketController extends BaseController {
             int same = tJobticketService.selectTJobticketSameData(tJobticket);
             if (same > 0) {
                 sameCount++;
+                tInvoiceWorkcontent.setAddStatus(1);
+                invoiceWorkcontentMapper.updateTInvoiceWorkcontent(tInvoiceWorkcontent);
             } else {
                 tJobticketService.insertTJobticket(tJobticket);
                 nosanmeCount++;
+                tInvoiceWorkcontent.setAddStatus(1);
+                invoiceWorkcontentMapper.updateTInvoiceWorkcontent(tInvoiceWorkcontent);
             }
 
             contentUserUnit.delete(0, contentUserUnit.length());
         }
-        return AjaxResult.success("成功导入" + nosanmeCount + "条数据，" + "未导入重复" + sameCount + "条数据！");
+        return AjaxResult.success("成功导入" + nosanmeCount + "条数据，" +"\n"+ "未导入重复" + sameCount + "条数据！"+"\n" + "未填写票号" + noCount + "条数据！");
     }
 
     /**

ui/src/views/invoice/bookingworkticket/index.vue

@@ -121,7 +121,7 @@
           icon="el-icon-copy-document"
           size="mini"
           :disabled="multiple"
-          @click="tickedStatis"
+          @click="tickedStatis()"
           v-hasPermi="['ehs:jobticket:add']"
         >作业票统计
         </el-button>
@@ -189,6 +189,19 @@
       <el-table-column label="高处作业级别" align="center" prop="gczyjb" :formatter="gczyjbFormat"/>
       <el-table-column label="延期许可证号" align="center" prop="yqxkzh" :show-overflow-tooltip="true"/>
       <el-table-column label="索引" align="center" prop="tag" width="60" :show-overflow-tooltip="true"/>
+      <el-table-column label="开票" align="center" width="90">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.addStatus == 1" size="small" type="success">已开票</el-tag>
+          <el-button
+            v-else
+            size="mini"
+            type="text"
+            @click="tickedStatis(scope.row)"
+          > <span>开票</span>
+          </el-button>
+        </template>
+
+      </el-table-column>
       <el-table-column label="续票预约" align="center" width="90">
         <template slot-scope="scope">
           <el-button
@@ -798,8 +811,9 @@ export default {
       return row.guid;
     },
     //作业票统计
-    tickedStatis() {
-      let putData = this.$refs.multipleTable.selection
+    tickedStatis(row) {
+      console.log(row)
+      let putData = row? [row] : this.$refs.multipleTable.selection
       for (let i = 0; i <putData.length ; i++) {
         if (putData[i].bookingworkticket.status != 3) {
           this.$alert(this.$t('只能提交状态为已完成的预约票'), this.$t('提示'), {
@@ -810,6 +824,7 @@ export default {
       }
       batchAddJobticket(putData).then(response => {
         this.msgSuccess(this.$t(response.msg));
+        this.getList()
       });
 
     },