优化

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

@@ -418,14 +418,6 @@ public class UserCorpwxTimeController {
         LocalDate localDate = LocalDate.parse(date, df);
         //如果是今天，取日打卡记录接口，如果是过往其他日期，取考勤记录接口
         if (localDate.isEqual(LocalDate.now())) {
-            List<UserCorpwxTime> oldCorpwxTimes = userCorpwxTimeMapper.selectList(new QueryWrapper<UserCorpwxTime>()
-                    .eq("corpwx_userid", user.getCorpwxUserid()).eq("create_date", date));
-            if(oldCorpwxTimes.size()>0 && oldCorpwxTimes.get(0).getWorkHours() > 0){
-                UserCorpwxTime time = oldCorpwxTimes.get(0);
-                resultMap.put("time", time);
-                msg.data=resultMap;
-                return msg;
-            }
             LocalDateTime start = LocalDateTime.of(localDate, LocalTime.MIN);
             LocalDateTime end = LocalDateTime.of(localDate, LocalTime.MAX).withSecond(0).withNano(0);
             wxCorpInfoService.getUserPunchRecord(user.getCompanyId(),user.getId(),start,end,false);

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

@@ -982,6 +982,8 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         BeanUtils.copyProperties(prodProcedureTeam,p);
         p.setId(null);
         p.setUserId(newPeopleId);
+        //默认钢印号不需要继承； Added By QYT 20230901
+        p.setSteelNumArray(null);
         if(plan.getPlanType()==0){
             p.setStatus(0);
         }else {

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

@@ -152,7 +152,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             lastProgress = report.getProgress();
         } else {
             //今天之前没有报过工
-            if (todayReport == null || prodProcedureTeam.getIsChange()==0) {
+            if (todayReport == null) {
                 lastProgress = prodProcedureTeam.getProgress();
                 if (report.getProgress() <= lastProgress) {
                     httpRespMsg.setError("进度必须大于上次报工进度("+lastProgress+"%)");
@@ -240,13 +240,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             user.setPassword(null);
             userList.add(user);
         } else if (checkType == 1) {
-            System.out.println(""+deptId+" , "+user.getDepartmentId());
             //当前人员如果不在该计划部门下面，属于外调的，那他的审核人应该是该部门的主要负责人（工长）
             if (!deptId.equals(user.getDepartmentId())) {
                 Department department = departmentMapper.selectById(deptId);
                 String managerId = department.getManagerId();
                 User targetUser = userMapper.selectOne(new QueryWrapper<User>().select("id, name, corpwx_userid").eq("id", managerId));
-                System.out.println("targetUser:"+targetUser.getName());
                 userList.add(targetUser);
             } else {
                 List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/components/chooseSomeone.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="chooseSomeone">
+    <p style="line-height: 30px;text-align: center;">请选择要{{type?'替换':'新增'}}的人员</p>
     <div class="chooseSomeone_selsect">
       <van-search v-model.trim="selectValue" shape="round" background="#F4F4F4" placeholder="请输入姓名" @search="onSearch"
         @input="onSearch"></van-search>
@@ -64,6 +65,10 @@
  */
 export default {
   props: {
+    isAdd: {
+      type: Number,
+      default: () => 1 
+    },
     groupView: {
       type: Number,
       default: () => 1 // 1单选 2复选 3tree

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/Login.vue

@@ -8,7 +8,7 @@
                         <img v-else :src="'/upload/'+appLogo" style="width:100px;height:80px;"/>
                     </div>
                     <h3 class="title">{{ appName? appName:"生产车间工时管家" }}</h3>
-                    <p style="color:goldenrod;text-align: center;">演示版</p>
+                    <!-- <p style="color:goldenrod;text-align: center;">演示版</p> -->
                     <el-form-item class="login-input" prop="username">
                         <el-input type="text" v-model="ruleForm.username" autocomplete="off" :placeholder="$t('zhang-hao-shou-ji-hao')" clearable prefix-icon="el-icon-user-solid"></el-input>
                     </el-form-item>