1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -2152,5 +2152,11 @@ public class ReportController {
         return reportService.fillAll(month,userId,departmentId,whether,request);
     }
 
+
+    @RequestMapping("/projectReportPushToSap")
+    public HttpRespMsg projectReportPushToSap(){
+        return new HttpRespMsg();
+    }
+
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -11067,6 +11067,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         //已有的项目分类
         List<ProjectCategory> allProjectCategoryList = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id", companyId));
+        List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", companyId));
         XmlRequestData xmlRequestData=new XmlRequestData();
         ProcessingConditions processingConditions=new ProcessingConditions();
         processingConditions.setQueryHitsUnlimitedIndicator("true");
@@ -11163,7 +11164,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 project.setProjectCode(item.getProjectSummaryTask().getProjectElementID());
                 project.setCompanyId(companyId);
                 //处理项目数据 --->工时管家生成对应项目数据
-                save(project);
+                Optional<Project> any = projectList.stream().filter(pt -> pt.getProjectCode().equals(project.getProjectCode())).findAny();
+                if(any.isPresent()){
+                    project.setId(any.get().getId());
+                }
+                saveOrUpdate(project);
                 //处理项目下任务 ----> 工时管家生成任务分组
                 List<ProjectTask> projectTasks = item.getProjectTasks();
                 if(projectTasks!=null&&projectTasks.size()>0){
@@ -11172,7 +11177,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         taskGroup.setProjectId(project.getId());
                         taskGroup.setTaskGroupCode(ps.getProjectElementID());
                         taskGroup.setName(ps.getTaskGroupName().getName());
-                        taskGroupList.add(taskGroup);
+                        TaskGroup one = taskGroupMapper.selectOne(new QueryWrapper<TaskGroup>().eq("project_id", project.getId()).eq("task_group_code", ps.getProjectElementID()));
+                        if(one==null){
+                            taskGroupList.add(taskGroup);
+                        }
                     });
                 }
             }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/webservice/po/Item.java

@@ -0,0 +1,21 @@
+package com.management.platform.webservice.po;
+
+import lombok.Data;
+
+import javax.xml.bind.annotation.XmlElement;
+
+@Data
+public class Item {
+
+    private String severityCode;
+    private String note;
+
+    @XmlElement(name = "SeverityCode")
+    public String getSeverityCode() {
+        return severityCode;
+    }
+    @XmlElement(name = "Note")
+    public String getNote() {
+        return note;
+    }
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/webservice/po/Log.java

@@ -0,0 +1,17 @@
+package com.management.platform.webservice.po;
+
+import lombok.Data;
+
+import javax.xml.bind.annotation.XmlElement;
+
+@Data
+public class Log {
+
+    private Item item;
+
+    @XmlElement(name = "Item")
+    public Item getItem() {
+        return item;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/webservice/po/Service.java

@@ -0,0 +1,52 @@
+package com.management.platform.webservice.po;
+
+import lombok.Data;
+
+import javax.xml.bind.annotation.XmlElement;
+
+@Data
+public class Service {
+
+    private String serviceID;
+    private Service employeeID;
+    private String planWork;
+    private String remainingWork;
+    private String startDate;
+    private String endDate;
+    private String overDeliveryAllowedIndicator;
+
+    @XmlElement(name = "ServiceID")
+    public String getServiceID(){
+        return serviceID;
+    }
+
+    @XmlElement(name = "EmployeeID")
+    public Service getEmployeeID(){
+        return employeeID;
+    }
+
+    @XmlElement(name = "PlanWork")
+    public String getPlanWork(){
+        return planWork;
+    }
+
+    @XmlElement(name = "RemainingWork")
+    public String getRemainingWork(){
+        return remainingWork;
+    }
+
+    @XmlElement(name = "StartDate")
+    public String getStartDate(){
+        return startDate;
+    }
+
+    @XmlElement(name = "EndDate")
+    public String getEndDate(){
+        return endDate;
+    }
+
+    @XmlElement(name = "OverDeliveryAllowedIndicator")
+    public String getOverDeliveryAllowedIndicator(){
+        return overDeliveryAllowedIndicator;
+    }
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/webservice/po/Task.java

@@ -0,0 +1,22 @@
+package com.management.platform.webservice.po;
+
+import lombok.Data;
+
+import javax.xml.bind.annotation.XmlElement;
+
+@Data
+public class Task {
+
+    private String projectTaskID;
+    private Service service;
+
+    @XmlElement(name = "ProjectTaskID")
+    public String getProjectTaskID(){
+        return projectTaskID;
+    }
+
+    @XmlElement(name = "Service")
+    public Service getService(){
+        return service;
+    }
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/webservice/po/XmlRequestData.java

@@ -15,7 +15,8 @@ import java.util.List;
 public class XmlRequestData {
 	private ProcessingConditions processingConditions;
 	private List<ProjectSelectionByElement> projectSelectionByElements;
-	
+	private ZManageProjectTaskWork zManageProjectTaskWork;
+
 	@XmlElement(name = "ProcessingConditions")
 	public ProcessingConditions getProcessingConditions() {
 		return processingConditions;
@@ -26,4 +27,9 @@ public class XmlRequestData {
 		return projectSelectionByElements;
 	}
 
+	@XmlElement(name = "ZManageProjectTaskWork")
+	public ZManageProjectTaskWork getZManageProjectTaskWork() {
+		return zManageProjectTaskWork;
+	}
+
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/webservice/po/XmlResponseData.java

@@ -19,6 +19,10 @@ public class XmlResponseData{
 
 	private List<ProjectQueryResponse> projectQueryResponses;
 
+	private ZManageProjectTaskWork zManageProjectTaskWork;
+
+	private Log log;
+
 	
 	@XmlElement(name = "ServiceProduct")
 	public List<ServiceProduct> getServiceProducts() {
@@ -35,4 +39,14 @@ public class XmlResponseData{
 		return projectQueryResponses;
 	}
 
+	@XmlElement(name = "ZManageProjectTaskWork")
+	public ZManageProjectTaskWork getZManageProjectTaskWork() {
+		return zManageProjectTaskWork;
+	}
+
+	@XmlElement(name = "Log")
+	public Log getLog() {
+		return log;
+	}
+
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/webservice/po/ZManageProjectTaskWork.java

@@ -0,0 +1,28 @@
+package com.management.platform.webservice.po;
+
+import lombok.Data;
+
+import javax.xml.bind.annotation.XmlElement;
+
+@Data
+public class ZManageProjectTaskWork {
+
+    private String projectID;
+    private Task task;
+    private String UUID;
+
+    @XmlElement(name = "ProjectID")
+    public String getProjectID() {
+        return projectID;
+    }
+
+    @XmlElement(name = "Task")
+    public Task getTask() {
+        return task;
+    }
+
+    @XmlElement(name = "UUID")
+    public String getUUID() {
+        return UUID;
+    }
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/PlanController.java

@@ -131,5 +131,16 @@ public class PlanController {
     public HttpRespMsg getNowMouthProdProgress(){
         return planService.getNowMouthProdProgress();
     }
+
+    @RequestMapping("/hidePlan")
+    public HttpRespMsg hidePlan(Integer id,Integer state){
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        Plan plan = planService.getById(id);
+        plan.setHideState(state);
+        if(!planService.updateById(plan)){
+            httpRespMsg.setError("验证失败");
+        }
+        return httpRespMsg;
+    }
 }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/Plan.java

@@ -22,7 +22,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2023-08-31
+ * @since 2023-11-16
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -235,6 +235,12 @@ public class Plan extends Model<Plan> {
     @TableField("vehicle_num_end")
     private Integer vehicleNumEnd;
 
+    /**
+     * 是否隐藏0-否 1-是
+     */
+    @TableField("hide_state")
+    private Integer hideState;
+
     @TableField(exist = false)
     private String  steelStampNumber;
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -130,7 +130,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         }else {
             LocalDate now = LocalDate.now();
             if(planType==0&&isMob==1){
-                queryWrapper.and(wrapper->wrapper.eq(Plan::getStartDate,now).or().inSql(Plan::getId,"select ppt1.plan_id \n" +
+                queryWrapper.and(wrapper->wrapper.eq(Plan::getStartDate,now).eq(Plan::getHideState,0).or().inSql(Plan::getId,"select ppt1.plan_id \n" +
                         "from  plan_procedure_total ppt1\n" +
                         "left join prod_procedure_team  ppt on ppt.plan_procedure_id=ppt1.id\n" +
                         "where ppt.progress<100"));

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/util/CodeGenerator.java

@@ -92,11 +92,11 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://47.101.180.183:3306/man_workshop?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://47.101.180.183:17089/man_workshop?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("HuoshiDB@2022");
+        dsc.setPassword("P011430@Huoshi*");
         mpg.setDataSource(dsc);
 
         // 包配置

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/PlanMapper.xml

@@ -36,11 +36,12 @@
         <result column="status" property="status" />
         <result column="vehicle_num_start" property="vehicleNumStart" />
         <result column="vehicle_num_end" property="vehicleNumEnd" />
+        <result column="hide_state" property="hideState" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, product_scheduling_num, product_id, product_name, project_code, company_id, num, main_process, station_id, station_name, foreman_id, foreman_name, plan_type, start_date, end_date, plan_total_wages, progress, task_name, task_type_id, task_type_name, check_type, task_change_notice_num, plan_man_num, plan_work_hour, money_of_job, describtion, version_number, create_time, create_id, status, vehicle_num_start, vehicle_num_end
+        id, product_scheduling_num, product_id, product_name, project_code, company_id, num, main_process, station_id, station_name, foreman_id, foreman_name, plan_type, start_date, end_date, plan_total_wages, progress, task_name, task_type_id, task_type_name, check_type, task_change_notice_num, plan_man_num, plan_work_hour, money_of_job, describtion, version_number, create_time, create_id, status, vehicle_num_start, vehicle_num_end, hide_state
     </sql>
 
 </mapper>

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponent.vue

@@ -78,9 +78,10 @@
         </el-table-column>
         <el-table-column prop="endDate" label="完工时间" width="180">
         </el-table-column>
-        <el-table-column label="操作" :fixed="'right'">
+        <el-table-column label="操作" :fixed="'right'" >
           <template slot-scope="scope">
             <div @click="editPlan(scope.row)" class="colorText">编辑</div>
+            <div v-if="jisuanDate(scope.row.startDate)>30" @click="hidePlan(scope.row.id,scope.row.hideState)" class="colorText">{{scope.row.hideState==0?'隐藏':'取消隐藏'}}</div>
           </template>
         </el-table-column>
       </el-table>
@@ -928,6 +929,50 @@ export default {
         }
       );
     },
+    jisuanDate(startDate){
+      let date1 = new Date(startDate);
+      let date2 = new Date();
+      date1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
+      date2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+      const diff = date2.getTime() - date1.getTime(); //目标时间减去当前时间
+      const diffDate = diff / (24 * 60 * 60 * 1000);
+      return diffDate;
+    },
+    //隐藏计划
+    hidePlan(id,state){
+      this.$alert(state==0?'隐藏计划在移动端将无法展示':'取消隐藏计划将在移动端将展示',state==0?'是否隐藏计划':'是否取消隐藏计划', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.http.post(
+              "/plan/hidePlan",
+              {
+                id:id,
+                state:state==0?1:0
+              },
+              (res) => {
+                if (res.code == "ok") {
+                  this.$message({
+                    message: '隐藏成功',
+                    type: "success",
+                  });
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: "error",
+                  });
+                }
+                this.getTableData()
+              },
+              (error) => {
+                this.$message({
+                  message: error,
+                  type: "error",
+                });
+              }
+            );
+          }
+      });
+    }
   },
 };
 </script>

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/statistic/index.vue

@@ -666,8 +666,14 @@ export default {
       }
     },
 
-    getUserList() {
-      this.http.post('/user/getSimpleActiveUserList', {},
+    getUserList(e) {
+      let param={}
+      if(e){
+        param={
+          departmentId:e
+        }
+      }
+      this.http.post('/user/getSimpleActiveUserList', param,
       res => {
           if (res.code == "ok") {
               this.userList = res.data;
@@ -1158,45 +1164,14 @@ export default {
         return  _this.gettime
     },
     selcts(e) {
-      this.page = 1
-      if(this.ins == 12){
-        this.groupWorktimeList.right = []
-        this.getGroupWorktimeList()
-      }else if(this.ins == 15){
-        this.getDepartmentsInvolved()
-      }else{
-      if(e == 9){
-        console.log(this.departmentIdArray);
-        this.userId = null
-        if(this.departmentIdArray.length != 0){
-          let deptid = []
-          for(let i in this.departmentIdArray){
-            deptid.push(this.departmentIdArray[i][this.departmentIdArray[i].length - 1])
-          }
-          // let deptid = this.departmentIdArray[this.departmentIdArray.length - 1]
-          this.selUserList = this.userList.filter(item => {
-            let boo = false
-            for(let i in deptid){
-              if(item.departmentId == deptid[i]){
-                boo = true
-              }
-            }
-            return boo
-            // item.departmentId == deptid
-          })
-        }else{
-          this.selUserList = this.userList
-        }
-      }
-      if(e == 10){
-        this.proJuctId = ''
-        this.departmentIdArray = []
-        this.selUserList = this.userList
-        this.userId = ''
-      }
-      console.log(this.userId,'==============')
-      this.getList(true)
-      }
+    if(this.departmentIdArray.length != 0){
+        let deptId=this.departmentIdArray[0]
+        this.getUserList(deptId);
+    }else{
+      this.getUserList()
+    }
+    console.log(this.userId,'==============')
+    this.getList(true)
     },
     // 自定义点击事件
     selectCal(obj) {