feat:生产任务接口冲突问题,生产任务变在产任务,任务统计日期修改

zkqy-admin/src/main/java/com/zkqy/web/controller/homepagestatistics/StatisticsController.java

@@ -107,7 +107,7 @@ public class StatisticsController {
         List<Map> mapList1= bpmExecuteProcessService.selectBpmExecuteProcessListProductionCount(bpmExecuteProcess);
         List<Map> list = new ArrayList<>();
         HashMap hashMap1=new HashMap();
-        hashMap1.put("name","生产任务");
+        hashMap1.put("name","在产任务");
         hashMap1.put("type","line");
         hashMap1.put("smooth","true");
         hashMap1.put("data",mapList1.stream().map((item->item.get("count"))).collect(Collectors.toList()));

zkqy-business/pom.xml

@@ -35,6 +35,12 @@
             <artifactId>zkqy-process-execution</artifactId>
             <version>3.8.5</version>
         </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

zkqy-framework/src/main/java/com/zkqy/framework/manager/factory/AsyncFactory.java

@@ -65,7 +65,7 @@ public class AsyncFactory
                 logininfor.setBrowser(browser);
                 logininfor.setOs(os);
                 logininfor.setMsg(message);
-                logininfor.setWhichApplication("2");
+                logininfor.setWhichApplication("1");
                 // 日志状态
                 if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
                 {
@@ -116,7 +116,7 @@ public class AsyncFactory
                 // 增加租户标识
                 logininfor.setTenantId(tenantId);
                 // 增加是客户端的登录
-                logininfor.setWhichApplication("2");
+                logininfor.setWhichApplication("1");
                 // 日志状态
                 if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
                 {

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/controller/BpmExecuteProcessController.java

@@ -131,7 +131,7 @@ public class BpmExecuteProcessController extends BaseController {
      * 化纤项目查询流程执行任务列表
      */
     // @PreAuthorize("@ss.hasPermi('system:process:list')")
-    @GetMapping("/chemicalFibreList")
+    @GetMapping("/list/chemicalFibreList")
     public TableDataInfo ChemicalFibreList(BpmExecuteProcess bpmExecuteProcess) throws Exception {
         startPage();
         return getDataTable(bpmExecuteProcessService.selectChemicalFibreBpmExecuteProcessList(bpmExecuteProcess));

zkqy-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteProcessMapper.xml

@@ -127,6 +127,10 @@
             <if test="delFlag != null">del_flag,</if>
             <if test="remark != null">remark,</if>
             <if test="taskProcessType != null">task_process_type,</if>
+            <if test="taskProcessType != null">task_process_type,</if>
+            <if test="createById != null">create_by_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskKey != null">#{taskKey},</if>
@@ -142,6 +146,9 @@
             <if test="delFlag != null">#{delFlag},</if>
             <if test="remark != null">#{remark},</if>
             <if test="taskProcessType != null">#{taskProcessType},</if>
+            <if test="createById != null">#{createById},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
         </trim>
     </insert>
 

zkqy-ui/src/api/bpmprocess/run/executeProcess.js

@@ -55,7 +55,7 @@ export function processList(query) {
 // 执行管道列表数据  带产线信息
 export function chemicalFibreList(query) {
   return request({
-    url: '/system/execute/process/chemicalFibreList',
+    url: '/system/execute/process/list/chemicalFibreList',
     method: 'get',
     params: query,
     baseURL: process.env.VUE_APP_BASE_API4,

zkqy-ui/src/views/index.vue

@@ -115,10 +115,10 @@ export default {
           //  console.log(response.data);
           //  console.log(response.data[0].date);
           let xAxisData = response.data[0].date;
-          xAxisData = xAxisData.map(function (dateStr) {
-            var date = new Date(dateStr);
-            return date.getMonth() + 1 + "月" + date.getDate() + "日";
-          });
+          // xAxisData = xAxisData.map(function (dateStr) {
+          //   var date = new Date(dateStr);
+          //   return date.getMonth() + 1 + "月";
+          // });
           let loginList = response.data.map((item) => item.name);
           this.chartObj.myChart2.setOption({
             legend: {