Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

client/src/views/OaSystem/officeCenter/rzglPage/index.vue

@@ -1,17 +1,117 @@
 <template>
-  <div class="purchaseContractBox">
-    <img src="@/assets/imgs/kfz.jpg" />
+  <div class="oa-sys-list-view">
+    <div class="searchBox">
+      <div class="form">
+        <span class="formSpan">软著名称：</span>
+        <el-input v-model="formData.name" placeholder="请输入软著名称" style="width: 210px" />
+      </div>
+
+      <div class="from">
+        <div class="btnBox">
+          <el-button type="primary" style="background: #3485ff" @click="onSearchHandle">
+            <img src="@/assets/imgs/OA/search.png" class="mr-8px" alt="" />
+            查询</el-button
+          >
+        </div>
+      </div>
+    </div>
+    <div class="tableBox">
+      <TableLayout :is-loading="loading" :data="list">
+        <el-table-column label="软著名称" prop="name" width="150" />
+        <el-table-column show-overflow-tooltip="true" label="取得日期" align="center" prop="acDate">
+          <template #default="scope">
+            <span>{{ formatDate(scope.row.acDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip="true" label="有效日期" align="center" prop="efDate">
+          <template #default="scope">
+            <span>{{ formatDate(scope.row.efDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="证书文件地址" prop="filePath" />
+        <el-table-column label="证书图片地址" prop="imgPath" />
+      </TableLayout>
+
+      <div class="pageBox">
+        <el-pagination
+          v-model:current-page="formData.pageNo"
+          :page-size="formData.pageSize"
+          background
+          layout="total, prev, pager, next, jumper"
+          :total="total"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
   </div>
 </template>
 
-<style lang="scss" scoped>
-.purchaseContractBox {
-  margin-top: 20px;
-  height: calc(100% - 20px);
-  background-color: #fff;
-  border-radius: 20px;
-  padding: 20px;
-  position: relative;
-  text-align: center;
+<script setup lang="ts">
+import request from '@/config/axios'
+import { ref } from 'vue'
+import { useRouter } from 'vue-router'
+import TableLayout from '../../oaViews/layout/TableLayout.vue'
+import { formatDate } from '@/utils/formatTime'
+
+defineOptions({ name: 'Software' })
+
+const router = useRouter()
+
+const formData = ref<{
+  pageNo: number
+  pageSize: number
+  name: string
+}>({
+  pageNo: 1,
+  pageSize: 15,
+  name: ''
+})
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数
+
+/** 查询列表 */
+const queryListByPage = async () => {
+  loading.value = true
+  try {
+    const urlApi = `/adm/software/page`
+    const sendData = {
+      ...formData
+    }
+    const result = await request.get({ url: urlApi, params: sendData._rawValue }, '/admin-api')
+    list.value = result['list']
+    total.value = result['total']
+    loading.value = false
+  } catch (error) {
+    loading.value = false
+  }
 }
-</style>
+
+const operateClick = (row: any) => {
+  router.push({
+    path: '/processLook',
+    query: {
+      url:
+        `${
+          import.meta.env.VITE_PROCESS_DETAIL_URI
+        }/IFlowInstance/redirectFlowPage?flowInstanceId=` + row.instanceId
+    }
+  })
+}
+
+/** 搜索按钮操作 */
+const onSearchHandle = (): void => {
+  queryListByPage()
+}
+
+/** 分页操作 */
+const handleCurrentChange = (): void => {
+  queryListByPage()
+}
+
+/** 初始化 */
+onMounted(() => {
+  queryListByPage()
+})
+</script>

client/src/views/OaSystem/officeCenter/zlglPage/index.vue

@@ -1,17 +1,122 @@
 <template>
-  <div class="purchaseContractBox">
-    <img src="@/assets/imgs/kfz.jpg" />
+  <div class="oa-sys-list-view">
+    <div class="searchBox">
+      <div class="form">
+        <span class="formSpan">专利名称：</span>
+        <el-input v-model="formData.patentName" placeholder="请输入专利名称" style="width: 210px" />
+      </div>
+
+      <div class="from">
+        <div class="btnBox">
+          <el-button type="primary" style="background: #3485ff" @click="onSearchHandle">
+            <img src="@/assets/imgs/OA/search.png" class="mr-8px" alt="" />
+            查询</el-button
+          >
+        </div>
+      </div>
+    </div>
+    <div class="tableBox">
+      <TableLayout :is-loading="loading" :data="list">
+        <el-table-column label="专利名称" prop="patentName" width="150" />
+        <el-table-column show-overflow-tooltip="true" label="取得日期" align="center" prop="acDate">
+          <template #default="scope">
+            <span>{{ formatDate(scope.row.acDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip="true" label="有效日期" align="center" prop="efDate">
+          <template #default="scope">
+            <span>{{ formatDate(scope.row.efDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="发明人" prop="inventor" />
+        <el-table-column label="证书文件地址" prop="filePath" />
+        <el-table-column label="证书图片地址" prop="imgPath" />
+      </TableLayout>
+
+      <div class="pageBox">
+        <el-pagination
+          v-model:current-page="formData.pageNo"
+          :page-size="formData.pageSize"
+          background
+          layout="total, prev, pager, next, jumper"
+          :total="total"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
   </div>
 </template>
 
-<style lang="scss" scoped>
-.purchaseContractBox {
-  margin-top: 20px;
-  height: calc(100% - 20px);
-  background-color: #fff;
-  border-radius: 20px;
-  padding: 20px;
-  position: relative;
-  text-align: center;
+<script setup lang="ts">
+import { defaultProps, handleTree } from '@/utils/tree'
+import request from '@/config/axios'
+import { DICT_TYPE, getDictLabel, getDictOptions } from '@/utils/dict'
+import { ref } from 'vue'
+import { useRouter } from 'vue-router'
+import TableLayout from '../../oaViews/layout/TableLayout.vue'
+import { formatDate } from '@/utils/formatTime'
+import * as DeptApi from '@/api/system/dept'
+import { arrFlatten } from '@/views/OaSystem/attendanceCenter/attendAuth'
+
+defineOptions({ name: 'Qualification' })
+
+const router = useRouter()
+
+const formData = ref<{
+  pageNo: number
+  pageSize: number
+  patentName: string
+}>({
+  pageNo: 1,
+  pageSize: 15,
+  patentName: ''
+})
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数
+
+/** 查询列表 */
+const queryListByPage = async () => {
+  loading.value = true
+  try {
+    const urlApi = `/adm/patent/page`
+    const sendData = {
+      ...formData
+    }
+    const result = await request.get({ url: urlApi, params: sendData._rawValue }, '/admin-api')
+    list.value = result['list']
+    total.value = result['total']
+    loading.value = false
+  } catch (error) {
+    loading.value = false
+  }
 }
-</style>
+
+const operateClick = (row: any) => {
+  router.push({
+    path: '/processLook',
+    query: {
+      url:
+        `${
+          import.meta.env.VITE_PROCESS_DETAIL_URI
+        }/IFlowInstance/redirectFlowPage?flowInstanceId=` + row.instanceId
+    }
+  })
+}
+
+/** 搜索按钮操作 */
+const onSearchHandle = (): void => {
+  queryListByPage()
+}
+
+/** 分页操作 */
+const handleCurrentChange = (): void => {
+  queryListByPage()
+}
+
+/** 初始化 */
+onMounted(() => {
+  queryListByPage()
+})
+</script>

client/src/views/OaSystem/officeCenter/zzglPage/index.vue

@@ -1,17 +1,121 @@
 <template>
-  <div class="purchaseContractBox">
-    <img src="@/assets/imgs/kfz.jpg" />
+  <div class="oa-sys-list-view">
+    <div class="searchBox">
+      <div class="form">
+        <span class="formSpan">资质名称：</span>
+        <el-input v-model="formData.name" placeholder="请输入资质名称" style="width: 210px" />
+      </div>
+
+      <div class="from">
+        <div class="btnBox">
+          <el-button type="primary" style="background: #3485ff" @click="onSearchHandle">
+            <img src="@/assets/imgs/OA/search.png" class="mr-8px" alt="" />
+            查询</el-button
+          >
+        </div>
+      </div>
+    </div>
+    <div class="tableBox">
+      <TableLayout :is-loading="loading" :data="list">
+        <el-table-column label="资质名称" prop="name" width="150" />
+        <el-table-column show-overflow-tooltip="true" label="取得日期" align="center" prop="acDate">
+          <template #default="scope">
+            <span>{{ formatDate(scope.row.acDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip="true" label="有效日期" align="center" prop="efDate">
+          <template #default="scope">
+            <span>{{ formatDate(scope.row.efDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="证书文件地址" prop="filePath" />
+        <el-table-column label="证书图片地址" prop="imgPath" />
+      </TableLayout>
+
+      <div class="pageBox">
+        <el-pagination
+          v-model:current-page="formData.pageNo"
+          :page-size="formData.pageSize"
+          background
+          layout="total, prev, pager, next, jumper"
+          :total="total"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
   </div>
 </template>
 
-<style lang="scss" scoped>
-.purchaseContractBox {
-  margin-top: 20px;
-  height: calc(100% - 20px);
-  background-color: #fff;
-  border-radius: 20px;
-  padding: 20px;
-  position: relative;
-  text-align: center;
+<script setup lang="ts">
+import { defaultProps, handleTree } from '@/utils/tree'
+import request from '@/config/axios'
+import { DICT_TYPE, getDictLabel, getDictOptions } from '@/utils/dict'
+import { ref } from 'vue'
+import { useRouter } from 'vue-router'
+import TableLayout from '../../oaViews/layout/TableLayout.vue'
+import { formatDate } from '@/utils/formatTime'
+import * as DeptApi from '@/api/system/dept'
+import { arrFlatten } from '@/views/OaSystem/attendanceCenter/attendAuth'
+
+defineOptions({ name: 'Qualification' })
+
+const router = useRouter()
+
+const formData = ref<{
+  pageNo: number
+  pageSize: number
+  name: string
+}>({
+  pageNo: 1,
+  pageSize: 15,
+  name: ''
+})
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数
+
+/** 查询列表 */
+const queryListByPage = async () => {
+  loading.value = true
+  try {
+    const urlApi = `/adm/qualification/page`
+    const sendData = {
+      ...formData
+    }
+    const result = await request.get({ url: urlApi, params: sendData._rawValue }, '/admin-api')
+    list.value = result['list']
+    total.value = result['total']
+    loading.value = false
+  } catch (error) {
+    loading.value = false
+  }
 }
-</style>
+
+const operateClick = (row: any) => {
+  router.push({
+    path: '/processLook',
+    query: {
+      url:
+        `${
+          import.meta.env.VITE_PROCESS_DETAIL_URI
+        }/IFlowInstance/redirectFlowPage?flowInstanceId=` + row.instanceId
+    }
+  })
+}
+
+/** 搜索按钮操作 */
+const onSearchHandle = (): void => {
+  queryListByPage()
+}
+
+/** 分页操作 */
+const handleCurrentChange = (): void => {
+  queryListByPage()
+}
+
+/** 初始化 */
+onMounted(() => {
+  queryListByPage()
+})
+</script>

zjugis-business/src/main/java/com/zjugis/business/controller/CustomerController.java

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.CustomerDto;
 import com.zjugis.business.bean.entity.Customer;
 import com.zjugis.business.bean.response.CustomerResponse;
+import com.zjugis.business.job.ProjectCostJob;
 import com.zjugis.business.service.CustomerService;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.workflow.utils.zTree;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -30,6 +32,9 @@ public class CustomerController {
     @Resource
     private CustomerService customerService;
 
+    @Autowired
+    private ProjectCostJob projectCostJob;
+
 
     /**
      * 通过主键查询单条数据
@@ -101,5 +106,10 @@ public class CustomerController {
     public CommonResult<String> createNumber(@RequestBody Customer customer) {
         return CommonResult.success(customerService.createNumber(customer));
     }
+
+    @GetMapping("/job/test")
+    public void test(){
+        projectCostJob.projectCostJob();
+    }
 }
 

zjugis-business/src/main/resources/mapper/oracle/ProjectCostMapper.xml

@@ -45,6 +45,6 @@
     </select>
 
     <select id="selectCurMonthProjectIds" resultType="java.lang.String">
-        SELECT PROJECT_ID FROM PROJECT_COST WHERE COUNT_DATE = to_timestamp(#{date,jdbcType=VARCHAR},"YYYY-MM-DD") and ISVALID = 1 and PROJECT_ID IS NOT NUll;
+        SELECT PROJECT_ID FROM PROJECT_COST WHERE COUNT_DATE = to_timestamp(#{date,jdbcType=VARCHAR},'YYYY-MM-DD') and ISVALID = 1 and PROJECT_ID IS NOT NUll
     </select>
 </mapper>