Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/corpreport/index.vue

@@ -133,8 +133,8 @@ watchEffect(async () => {
   <div class="m-5 bg-white h-full p-4 rounded">
     <div class="flex justify-between">
       <el-form :model="form" class="flex gap-4">
-        <el-form-item class="w-28">
-          <el-select clearable v-model="form.date">
+        <el-form-item>
+          <el-select clearable v-model="form.date" style="width: 112px">
             <el-option
               v-for="date in dateOptions"
               :key="date.value"
@@ -143,14 +143,15 @@ watchEffect(async () => {
             />
           </el-select>
         </el-form-item>
-        <el-form-item class="w-28">
-          <el-select v-model="form.type" @change="form.member = undefined">
+        <el-form-item>
+          <el-select v-model="form.type" @change="form.member = undefined" style="width: 112px">
             <el-option label="按部门" :value="0" />
             <el-option label="按员工" :value="1" />
           </el-select>
         </el-form-item>
-        <el-form-item class="w-52">
+        <el-form-item>
           <el-select
+            style="width: 208px"
             clearable
             v-model="form.member"
             placeholder="选择部门（默认为本部门及下属部门）"

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

@@ -106,7 +106,7 @@ public class SalesOrderController {
             return msg;
         }
         if(countName>0){
-            msg.setError("订单名称为["+order.getOrderCode()+"]的订单已存在");
+            msg.setError("订单名称为["+order.getOrderName()+"]的订单已存在");
             return msg;
         }
         //todo：生成操作记录
@@ -117,6 +117,7 @@ public class SalesOrderController {
         auditLogCenter.setModuleCode("SalesOrder");;
         if(order.getId()==null){
             auditLogCenter.setAuditorContent("创建了订单");
+            auditLogCenterService.save(auditLogCenter);
         }else {
             SalesOrder oldOrder = salesOrderService.getById(order.getId());
             BeanChangeUtil<Product> beanChangeUtil = new BeanChangeUtil();
@@ -124,10 +125,10 @@ public class SalesOrderController {
             //发生变化才生成记录
             if(!StringUtils.isEmpty(content.trim())){
                 auditLogCenter.setAuditorContent("编辑了订单");
+                auditLogCenterService.save(auditLogCenter);
             }
 
         }
-        auditLogCenterService.save(auditLogCenter);
         if(!salesOrderService.saveOrUpdate(order)){
             msg.setError("验证失败");
             return msg;

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Product.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.management.platform.config.PropertyMsg;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -39,48 +40,56 @@ public class Product extends Model<Product> {
      * 产品名称
      */
     @TableField("product_name")
+    @PropertyMsg("产品名称")
     private String productName;
 
     /**
      * 产品编号
      */
     @TableField("product_code")
+    @PropertyMsg("产品编号")
     private String productCode;
 
     /**
      * 类型
      */
     @TableField("type")
+    @PropertyMsg("类型")
     private Integer type;
 
     /**
      * 单位
      */
     @TableField("unit")
+    @PropertyMsg("单位")
     private Integer unit;
 
     /**
      * 单价
      */
     @TableField("price")
+    @PropertyMsg("单价")
     private BigDecimal price;
 
     /**
      * 库存数量
      */
     @TableField("inventory")
+    @PropertyMsg("库存数量")
     private Integer inventory;
 
     /**
      * 状态 0-下架 1-上架
      */
     @TableField("status")
+    @PropertyMsg("状态")
     private Integer status;
 
     /**
      * 负责人id
      */
     @TableField("incharger_id")
+    @PropertyMsg("负责人")
     private String inchargerId;
 
     /**
@@ -131,6 +140,7 @@ public class Product extends Model<Product> {
      * 描述
      */
     @TableField("descs")
+    @PropertyMsg("描述")
     private String descs;
 
     /**

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/SalesOrder.java

@@ -11,6 +11,7 @@ import java.io.Serializable;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.management.platform.config.PropertyMsg;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -41,51 +42,58 @@ public class SalesOrder extends Model<SalesOrder> {
      * 订单名称
      */
     @TableField("order_name")
+    @PropertyMsg("订单名称")
     private String orderName;
 
     /**
      * 订单编号
      */
     @TableField("order_code")
+    @PropertyMsg("订单编号")
     private String orderCode;
 
     /**
      * 客户id
      */
     @TableField("custom_id")
+    @PropertyMsg("客户")
     private Integer customId;
 
     /**
      * 商机id
      */
     @TableField("business_opportunity_id")
+    @PropertyMsg("商机")
     private Integer businessOpportunityId;
 
     /**
      * 订单金额
      */
     @TableField("price")
+    @PropertyMsg("订单金额")
     private BigDecimal price;
 
     /**
      * 联系人id
      */
     @TableField("contacts_id")
+    @PropertyMsg("联系人")
     private Integer contactsId;
 
     /**
      * 订单类型
      */
     @TableField("type")
+    @PropertyMsg("订单类型")
     private Integer type;
 
     /**
      * 下单时间
      */
     @TableField("place_time")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime placeTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate placeTime;
 
     /**
      * 订单开始时间
@@ -93,6 +101,7 @@ public class SalesOrder extends Model<SalesOrder> {
     @TableField("order_start_date")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @PropertyMsg("订单开始时间")
     private LocalDate orderStartDate;
 
     /**
@@ -101,24 +110,28 @@ public class SalesOrder extends Model<SalesOrder> {
     @TableField("order_end_date")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @PropertyMsg("订单结束时间")
     private LocalDate orderEndDate;
 
     /**
      * 已回款金额
      */
     @TableField("received_payment")
+    @PropertyMsg("已回款金额")
     private BigDecimal receivedPayment;
 
     /**
      * 未回款金额
      */
     @TableField("un_received_payment")
+    @PropertyMsg("未回款金额")
     private BigDecimal unReceivedPayment;
 
     /**
      * 回款状态 0-未回款 1-已回款 2-已完全回款
      */
     @TableField("received_status")
+    @PropertyMsg("回款状态")
     private Integer receivedStatus;
 
 
@@ -126,24 +139,28 @@ public class SalesOrder extends Model<SalesOrder> {
      * 客户签约人
      */
     @TableField("custom_signer")
+    @PropertyMsg("客户签约人")
     private String customSigner;
 
     /**
      * 公司签约人
      */
     @TableField("company_signer")
+    @PropertyMsg("公司签约人")
     private String companySigner;
 
     /**
      * 负责人
      */
     @TableField("incharger_id")
+    @PropertyMsg("负责人")
     private String inchargerId;
 
     /**
      * 备注
      */
     @TableField("remark")
+    @PropertyMsg("备注")
     private String remark;
 
     @TableField("create_time")

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

@@ -560,8 +560,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                 deptIds=deptIds.stream().distinct().collect(Collectors.toList());
                 List<Integer> finalDeptIds2 = deptIds;
                 List<String> userIds = userList.stream().filter(u -> finalDeptIds2.contains(u.getDepartmentId())).map(User::getId).collect(Collectors.toList());
-                userIds.add("-1");
-                queryWrapper.in(Product::getCreatorId,userIds);
+                userIds.add(targetUsr.getId());
+                queryWrapper.and(wrapper->wrapper.in(Product::getCreatorId,userIds).or().in(Product::getInchargerId,userIds));
             }
         }
         queryWrapper.orderByDesc(Product::getUpdateTime);

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

@@ -159,13 +159,14 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             orderLambdaQueryWrapper.inSql(SalesOrder::getBusinessOpportunityId,"select id from business_opportunity where name like '%"+businessName+"%'");
         }
         if(receivedStatus!=null){
-            if(receivedStatus==1){
-                //回款金额不为空 切大于0 作为已回款状态
-                orderLambdaQueryWrapper.and(wrapper->wrapper.isNotNull(SalesOrder::getReceivedPayment).gt(SalesOrder::getReceivedPayment,0));
-            }else {
-                //回款金额为空 或者等于0 作为未回款状态
-                orderLambdaQueryWrapper.and(wrapper->wrapper.isNull(SalesOrder::getReceivedPayment).or().eq(SalesOrder::getReceivedPayment,0));
-            }
+//            if(receivedStatus==1){
+//                //回款金额不为空 切大于0 作为已回款状态
+//                orderLambdaQueryWrapper.and(wrapper->wrapper.isNotNull(SalesOrder::getReceivedPayment).gt(SalesOrder::getReceivedPayment,0));
+//            }else {
+//                //回款金额为空 或者等于0 作为未回款状态
+//                orderLambdaQueryWrapper.and(wrapper->wrapper.isNull(SalesOrder::getReceivedPayment).or().eq(SalesOrder::getReceivedPayment,0));
+//            }
+            orderLambdaQueryWrapper.eq(SalesOrder::getReceivedStatus,receivedStatus);
         }
         if(!StringUtils.isEmpty(startTime)&&!StringUtils.isEmpty(endTime)){
             orderLambdaQueryWrapper.lt(SalesOrder::getOrderStartDate,endTime).gt(SalesOrder::getOrderEndDate,startTime);
@@ -485,7 +486,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                         }
                     }else if(modelName.equals("placeTime")){
                         if(!StringUtils.isEmpty(cell.getStringCellValue())){
-                            order.setPlaceTime(LocalDateTime.parse(cell.getStringCellValue(),df1));
+                            order.setPlaceTime(LocalDate.parse(cell.getStringCellValue(),df));
                         }
                     }else if(modelName.equals("orderStartDate")){
                         if(!StringUtils.isEmpty(cell.getStringCellValue())){
@@ -656,6 +657,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
     public HttpRespMsg salesKit(Integer queryType,Integer dateType,String startDate, String endDate) {
         HttpRespMsg msg=new HttpRespMsg();
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        DateTimeFormatter df1=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LambdaQueryWrapper<Custom> customLambdaQueryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<Custom> customLambdaQueryWrapper1 = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<Contacts> contactsLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -669,11 +671,13 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         User user = userMapper.selectById(request.getHeader("token"));
         List<Department> allDeptList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getCompanyId, user.getCompanyId()));
         if(!StringUtils.isEmpty(startDate)&&!StringUtils.isEmpty(endDate)){
-            customLambdaQueryWrapper.between(Custom::getCreateTime,startDate,endDate);
+            startDate=startDate+" 00:00:00";
+            endDate=endDate+" 23:59:59";
+            customLambdaQueryWrapper.between(Custom::getCreateTime,LocalDateTime.parse(startDate,df1),LocalDateTime.parse(endDate,df1));
             contactsLambdaQueryWrapper.between(Contacts::getCreateTime,startDate,endDate);
-            businessOpportunityLambdaQueryWrapper.between(BusinessOpportunity::getCreateTime,startDate,endDate);
-            salesOrderLambdaQueryWrapper.between(SalesOrder::getCreateTime,startDate,endDate);
-            clueLambdaQueryWrapper.between(Clue::getCreateTime,startDate,endDate);
+            businessOpportunityLambdaQueryWrapper.between(BusinessOpportunity::getCreateTime,LocalDateTime.parse(startDate,df1),LocalDateTime.parse(endDate,df1));
+            salesOrderLambdaQueryWrapper.between(SalesOrder::getCreateTime,LocalDateTime.parse(startDate,df1),LocalDateTime.parse(endDate,df1));
+            clueLambdaQueryWrapper.between(Clue::getCreateTime,LocalDateTime.parse(startDate,df1),LocalDateTime.parse(endDate,df1));
         }
         if(dateType!=null){
             switch (dateType){
@@ -750,7 +754,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                     deptIds.add(-1);
                     List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getDepartmentId, deptIds));
                     List<String> userIds = userList.stream().map(User::getId).distinct().collect(Collectors.toList());
-                    userIds.add("-1");
+                    userIds.add(user.getId());
                     customLambdaQueryWrapper.in(Custom::getCreatorId,userIds);
                     contactsLambdaQueryWrapper.in(Contacts::getCreatorId,userIds);
                     businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getCreatorId,userIds);
@@ -768,7 +772,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                     Integer targetDeptId = user.getDepartmentId();
                     List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getDepartmentId, targetDeptId));
                     List<String> targetUserIds = users.stream().map(User::getId).distinct().collect(Collectors.toList());
-                    targetUserIds.add("-1");
+                    targetUserIds.add(user.getId());
                     customLambdaQueryWrapper.in(Custom::getCreatorId,targetUserIds);
                     contactsLambdaQueryWrapper.in(Contacts::getCreatorId,targetUserIds);
                     businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getCreatorId,targetUserIds);
@@ -787,7 +791,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                     List<Integer> branchDepartment = getBranchDepartment(targetDeptId1, allDeptList);
                     List<User> users1 = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getDepartmentId, branchDepartment));
                     List<String> targetUserIds1 = users1.stream().map(User::getId).distinct().collect(Collectors.toList());
-                    targetUserIds1.add("-1");
+                    targetUserIds1.add(user.getId());
                     customLambdaQueryWrapper.in(Custom::getCreatorId,targetUserIds1);
                     contactsLambdaQueryWrapper.in(Contacts::getCreatorId,targetUserIds1);
                     businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getCreatorId,targetUserIds1);

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

@@ -25,5 +25,6 @@ public class ReportVO extends Report {
     private String planType; //生产计划类型， 0-普通计划，1-插单计划
     private LocalDate startDate;
     private LocalDate  endDate;
+    private Integer  seq;
 
 }

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

@@ -101,6 +101,7 @@ public class PlanProcedureTotalServiceImpl extends ServiceImpl<PlanProcedureTota
             procedureMap.put("checker_id", map.get("checker_id"));
             procedureMap.put("check_type", map.get("check_type"));
             procedureMap.put("plan_check_type", map.get("plan_check_type"));
+            procedureMap.put("seq", map.get("seq"));
             procedureList.add(procedureMap);
         }
 

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

@@ -27,7 +27,7 @@
 
     <select id="getReportForWorkList" resultType="java.util.HashMap" >
         SELECT a.*, plan_procedure_total.plan_id, plan_procedure_total.prod_procedure_id,plan_procedure_total.total_working_hours,plan_procedure_total.total_wages, date_format(plan.`start_date`,'%Y-%m-%d') as start_date, date_format(plan.`end_date`,'%Y-%m-%d') as end_date, plan.`plan_type`,
-        plan.`product_scheduling_num`,plan.task_type_name,plan.task_name,plan.task_change_notice_num,
+        plan.`product_scheduling_num`,plan.task_type_name,plan.task_name,plan.task_change_notice_num,prod_procedure.seq,
         product.`name` AS product_name,prod_procedure.name AS procedure_name, prod_procedure.check_type, plan.check_type as plan_check_type,plan.vehicle_num_start,plan.vehicle_num_end,plan.num,
         (case when (select count(1) from report where user_procedure_team_id=a.id and creator_id=#{userId} and create_date=DATE_FORMAT(DATE(NOW()),'%Y-%m-%d'))>0 then 1 else 0 end ) isReported
         FROM prod_procedure_team a

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

@@ -115,7 +115,7 @@
 
     <!-- 批量获取员工某天的报告 -->
     <select id="getUserReportByDate" resultMap="FullMap">
-        select a.*,b.name as productName,prod_procedure.name as procedureName,checker.name as checkerName,u.name as creatorName,
+        select a.*,b.name as productName,prod_procedure.name as procedureName,prod_procedure.seq,checker.name as checkerName,u.name as creatorName,
         plan.task_type_name,plan.task_name,plan.task_change_notice_num,plan.product_scheduling_num,plan.plan_type,plan.start_date,plan.end_date
         FROM report AS a
         left JOIN product AS b ON a.product_id=b.id
@@ -391,7 +391,7 @@
         from plan b
         left join plan_procedure_total a on a.plan_id=b.id
         left join user u on u.id=b.station_id
-        where b.company_id=#{companyId}
+        where b.company_id=#{companyId} and b.plan_type=0
         <if test="userId!=null and userId!=''">
             and b.foreman_id=#{userId}
         </if>
@@ -540,7 +540,8 @@
         LEFT JOIN department dd ON d.superior_id=dd.department_id
         <where>
             p.status!=2 and
-            p.company_id=#{companyId}
+            p.company_id=#{companyId} and
+            p.plan_type=0
             <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
                 and p.start_date between #{startDate} and #{endDate}
             </if>

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/component/planComponent.vue

@@ -20,6 +20,9 @@
                 <div class="PlanItem">
                   <div>项目代码：</div><span>{{ item.product.code }}</span>
                 </div>
+                <div class="PlanItem">
+                  <div>项目名称：</div><span>{{ item.product.projectName }}</span>
+                </div>
                 <div class="PlanItem">
                   <div>计划总工价：</div><span class="textBeyondHiding">{{item.totalMoney}}</span>
                 </div>
@@ -287,26 +290,27 @@ export default {
         flex-wrap: wrap;
 
         .PlanItem {
-          width: 50%;
+          // width: 50%;
           display: flex;
           padding-top: 8px;
 
-          &:first-child {
-            width: 100%;
+          // &:first-child {
+          //   width: 100%;
 
-            span {
-              width: 200px;
-              word-break: break-all;
-            }
-          }
+          //   span {
+          //     width: 200px;
+          //     word-break: break-all;
+          //   }
+          // }
 
           div {
-            width: 100px;
+            width: 110px;
             text-align: right;
             color: #666;
           }
 
           span {
+            flex: 1;
             display: inline-block;
             color: #333;
           }

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/distribution.vue

@@ -17,7 +17,7 @@
           <van-checkbox v-if="todayAndTomorrow" :disabled="item.checkboxDisabled  || item.teamNames.indexOf(user.name) == -1"  v-model="item.prodProcedure.isSelected"  @click="itemChecked" shape="square">
           </van-checkbox>
           <div class="PlanItem">
-            <span>{{ item.prodProcedure.name }}</span>
+            <span>{{item.prodProcedure.seq}}. {{ item.prodProcedure.name }}</span>
           </div>
           <div class="PlanItem">
             <div>单件工价：</div><span class="textBeyondHiding">{{ item.prodProcedure.unitPrice }}</span>

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/workView.vue

@@ -47,7 +47,7 @@
             <div v-if="reportBoolean" class="marginBtnPro">{{ item.productSchedulingNum }}</div>
             <div>
               <van-row>
-                <van-col span="19">{{ prod.plan_type == 0 ? item.procedure_name : prod.task_change_notice_num }}</van-col>
+                <van-col span="19">{{item.seq}}. {{ prod.plan_type == 0 ? item.procedure_name : prod.task_change_notice_num }}</van-col>
                 <van-col span="5" style="text-align:right;"><span style="color:goldenrod;font-size:16px;">{{ item.work_time
                 }}</span> <span style="font-size:12px;">分钟</span></van-col>
               </van-row>
@@ -257,6 +257,7 @@ export default {
             job_of_money: item.jobOfMoney,
             plan_check_type: item.planCheckType,
             procedure_name: item.procedureName,
+            seq: item.seq,
             progress: item.progress,
             work_time: item.workingTime,
             finishNum: item.finishNum,

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

@@ -29,10 +29,11 @@
           :height="tableHight"
           v-if="TabIndex == 0" v-loading="tableDataLoading"
         >
-        <el-table-column
-          type="index"
-          width="50">
-        </el-table-column>
+        <el-table-column label="序号" width="60">
+            <template slot-scope="scope">{{
+              scope.row.prodProcedure.seq
+            }}</template>
+          </el-table-column>
           <el-table-column label="工序名称" width="400">
             <template slot-scope="scope">
                 <div class="disFlexscope">

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/product/list.vue

@@ -70,10 +70,7 @@
                             </el-form-item>
                             <el-form-item>
                                 <el-table :data="props.row.tableProdProcedure.procedureList" border style="width: 100%">
-                                    <el-table-column
-                                        type="index"
-                                        width="50">
-                                    </el-table-column>
+                                    <el-table-column prop="seq" label="序号" width="60"></el-table-column>
                                     <el-table-column prop="name" label="工序名称" width="180">
                                     </el-table-column>
                                     <el-table-column prop="workingTime" label="单件工时" width="180">