【admin&front】新增&优化# 1、修复若干bug

admin/src/main/java/com/hcy/admin/service/client/impl/EquipmentServiceImpl.java

@@ -13,6 +13,7 @@ import com.hcy.admin.vo.client.EquipmentListVo;
 import com.hcy.admin.vo.client.EquipmentDetailVo;
 import com.hcy.admin.vo.client.EquipmentModelDetailVo;
 import com.hcy.admin.vo.sparePart.SparePartListVo;
+import com.hcy.common.constant.GlobalConstant;
 import com.hcy.common.core.PageResult;
 import com.hcy.common.dto.EquipmentDto;
 import com.hcy.common.entity.client.Client;
@@ -20,6 +21,7 @@ import com.hcy.common.entity.client.Equipment;
 import com.hcy.common.entity.client.EquipmentModel;
 import com.hcy.common.entity.user.User;
 import com.hcy.common.enums.equipment.EquipmentStateEnum;
+import com.hcy.common.exception.OperateException;
 import com.hcy.common.mapper.client.ClientMapper;
 import com.hcy.common.mapper.client.EquipmentMapper;
 import com.hcy.common.mapper.client.EquipmentModelMapper;
@@ -154,7 +156,15 @@ public class EquipmentServiceImpl implements IEquipmentService {
     public void add(EquipmentParam equipmentParam) {
         Equipment model = new Equipment();
 
-        model.setNumber(equipmentParam.getNumber());
+        model.setNumber(equipmentParam.getNumber()); // 设备编号
+
+        Integer count = equipmentMapper.selectCount(new LambdaQueryWrapper<Equipment>()
+                .eq(Equipment::getIsDelete, GlobalConstant.NOT_DELETE)
+                .eq(Equipment::getNumber, equipmentParam.getNumber()));
+        if(count > 0){
+            throw new OperateException("设备编号不可重复！");
+        }
+
         model.setClientId(equipmentParam.getClientId());//客户id
         model.setName(equipmentParam.getName());
         model.setModel(equipmentParam.getModel()); // 设备型号
@@ -171,6 +181,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
         model.setDailyAudit(equipmentParam.getDailyAudit()); // 每隔几天巡检
         model.setCreateTime(System.currentTimeMillis() / 1000);
         //model.setDeviceCode(equipmentParam.getDeviceCode()); // 设备码
+
         equipmentMapper.insert(model);
     }
 
@@ -194,6 +205,12 @@ public class EquipmentServiceImpl implements IEquipmentService {
         model.setClientId(equipmentParam.getClientId());
         model.setModuleId(equipmentParam.getModuleId());
         model.setNumber(equipmentParam.getNumber());
+        Integer count = equipmentMapper.selectCount(new LambdaQueryWrapper<Equipment>()
+                .eq(Equipment::getIsDelete, GlobalConstant.NOT_DELETE)
+                .eq(Equipment::getNumber, equipmentParam.getNumber()));
+        if(count > 0){
+            throw new OperateException("设备编号不可重复！");
+        }
         model.setName(equipmentParam.getName());
         model.setModel(equipmentParam.getModel());
         model.setManufacturers(equipmentParam.getManufacturers());

admin/src/main/java/com/hcy/admin/service/plant/impl/PlantServiceImpl.java

@@ -64,7 +64,7 @@ public class PlantServiceImpl implements IPlantService {
 
         QueryWrapper<Plant> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_delete", 0);
-        queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
+        queryWrapper.orderByDesc(Arrays.asList("sort", "create_time"));
 
         plantMapper.setSearch(queryWrapper, params, new String[]{
             "like:name:str",
@@ -93,6 +93,15 @@ public class PlantServiceImpl implements IPlantService {
                     .eq(SystemAuthAdmin::getIsDelete, GlobalConstant.NOT_DELETE)
                     .eq(SystemAuthAdmin::getPlantId, item.getId()));
             vo.setNumberUsers(numberUsers);// 管理员人数
+
+            //获取工厂地址
+            Map<Long, String> regionMap = regionService.getRegionMap();//获取省市区
+            vo.setProvince(regionMap.get(item.getProvinceId()));
+            vo.setCity(regionMap.get(item.getCityId()));
+            vo.setDistrict(regionMap.get(item.getDistrictId()));
+            //工厂位置
+            vo.setFactoryLocation(vo.getProvince() + vo.getCity() + vo.getDistrict() + vo.getDetailedAddress());
+
             list.add(vo);
         }
 

admin/src/main/java/com/hcy/admin/service/sparePart/impl/SparePartServiceImpl.java

@@ -12,16 +12,22 @@ import com.hcy.admin.vo.sparePart.SparePartListVo;
 import com.hcy.admin.vo.sparePart.SparePartDetailVo;
 import com.hcy.common.constant.GlobalConstant;
 import com.hcy.common.core.PageResult;
+import com.hcy.common.entity.SparePartAudit.SparePartAudit;
 import com.hcy.common.entity.client.Client;
 import com.hcy.common.entity.client.ClientContacts;
 import com.hcy.common.entity.order.MaintenanceOrder;
 import com.hcy.common.entity.sparePart.SparePart;
+import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit;
 import com.hcy.common.entity.warehouse.Warehouse;
+import com.hcy.common.enums.SparePartStockAuditEnum;
+import com.hcy.common.enums.audit.AuditStateEnum;
 import com.hcy.common.enums.order.MaintenanceOrderStatusEnum;
 import com.hcy.common.exception.OperateException;
+import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper;
 import com.hcy.common.mapper.client.ClientContactsMapper;
 import com.hcy.common.mapper.client.ClientMapper;
 import com.hcy.common.mapper.sparePart.SparePartMapper;
+import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper;
 import com.hcy.common.mapper.warehouse.WarehouseMapper;
 import com.hcy.common.utils.StringUtil;
 import com.hcy.common.utils.TimeUtil;
@@ -52,6 +58,12 @@ public class SparePartServiceImpl implements ISparePartService {
     @Resource
     ClientContactsMapper clientContactsMapper;
 
+    @Resource
+    SparePartAuditMapper sparePartAuditMapper;
+
+    @Resource
+    SparePartStockAuditMapper sparePartStockAuditMapper;
+
     /**
      * 备件信息列表
      *
@@ -229,16 +241,41 @@ public class SparePartServiceImpl implements ISparePartService {
                 new QueryWrapper<SparePart>()
                         .in("id", ids));
 
-
         Assert.notNull(modelList, "数据不存在!");
         // GlobalConstant.NOT_DELETE 调用未删除常量
         // GlobalConstant.DELETE 删除标识
 
         for (SparePart sparePart : modelList) {
+            //删除前，先判断此配件是否已被关联到出入库审核单，是的话则无法删除，反之，可以被删除。
+            List<SparePartAudit> auditList = sparePartAuditMapper.selectList(new LambdaQueryWrapper<SparePartAudit>()
+                    .eq(SparePartAudit::getIsDelete, GlobalConstant.NOT_DELETE)
+                    .eq(SparePartAudit::getSparePartsId, sparePart.getId()));
+            if(auditList != null){
+                for (SparePartAudit sparePartAudit : auditList) {
+                    SparePartStockAudit sparePartStockAudit = sparePartStockAuditMapper.selectOne(new LambdaQueryWrapper<SparePartStockAudit>()
+                            .eq(SparePartStockAudit::getIsDelete, GlobalConstant.NOT_DELETE)
+                            .eq(SparePartStockAudit::getId, sparePartAudit.getStockAuditId()));
+                    if(sparePartStockAudit != null){
+                        if(sparePartStockAudit.getAuditResult() == null ||
+                                sparePartStockAudit.getAuditResult() == AuditStateEnum.NOT_PASS.getStatus()){
+                            throw new OperateException("此配件已被关联到出入库审核单！请先处理审核单再来删除！");
+                        }else{
+                            sparePart.setIsDelete(GlobalConstant.DELETE);
+                            sparePart.setDeleteTime(System.currentTimeMillis() / 1000);
+                            sparePartMapper.updateById(sparePart);// 进行伪删除 根据id把is_delete修改成1
+                            break;
+                        }
+                    }
+                }
+            }else{
                 sparePart.setIsDelete(GlobalConstant.DELETE);
                 sparePart.setDeleteTime(System.currentTimeMillis() / 1000);
                 sparePartMapper.updateById(sparePart);// 进行伪删除 根据id把is_delete修改成1
             }
+
+
+        }
+
     }
 
     /**

admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java

@@ -529,7 +529,7 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi
         SparePartStockAudit model = sparePartStockAuditMapper.findSparePartStockAuditById(id);
         Assert.notNull(model, "数据不存在!");
 
-        model.setIsDelete(GlobalConstant.NOT_DELETE);
+        model.setIsDelete(GlobalConstant.DELETE); // 是否删除: [0=否, 1=是]
         model.setDeleteTime(new Date());
         sparePartStockAuditMapper.updateById(model);
     }

admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java

@@ -162,7 +162,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
                     new QueryWrapper<User>()
                             .eq("id", vo.getUserId()));
             if(user != null){
-                vo.setReceiveOrderStatus(user.getReceiveOrderStatus());
+                item.setReceiveOrderStatus(user.getReceiveOrderStatus());
             }
 
             list.add(item);

admin/src/main/java/com/hcy/admin/validate/order/MaintenanceOrderParam.java

@@ -102,4 +102,7 @@ public class MaintenanceOrderParam implements Serializable {
     private String creatorName; // 创建人姓名
     private String receiverName; // 接单人姓名
     private String returnCause; //退回原因
+
+    private String createTimeStart; //报修开始时间
+    private String createTimeEnd; //报修结束时间
 }

admin/src/main/java/com/hcy/admin/vo/plant/PlantListVo.java

@@ -22,5 +22,16 @@ public class PlantListVo implements Serializable {
     private String remark; // 备注
     private String createTime; // 创建时间
 
+    private String longitude; // 经度
+    private String latitude; // 纬度
+    private Long provinceId; //省id
+    private Long cityId; //市id
+    private Long districtId; //区id
+    private String province; //省
+    private String city; //市
+    private String district; //区
+    private String detailedAddress; // 详细地址
+
     private List<SystemAuthAdmin> authAdminList; //待绑定的用户
+    private String factoryLocation; // 工厂位置
 }

common/src/main/java/com/hcy/common/dto/order/MaintenanceOrderDto.java

@@ -67,5 +67,6 @@ public class MaintenanceOrderDto implements Serializable {
     private String likeWork; //关键字
     private String shortName; //客户简称
     private String completeImg; // 完工照片
-
+    private String createTimeStart; //报修开始时间
+    private String createTimeEnd; //报修结束时间
 }

common/src/main/resources/mapper/MaintenanceOrderMapper.xml

@@ -62,6 +62,12 @@
                 or lc.client_name like concat('%',#{param.likeWork},'%')
                 or le.name like concat('%',#{param.likeWork},'%'))
             </if>
+            <if test="param.createTimeStart != null and param.createTimeStart != ''">
+                and lmo.create_time &gt;= #{param.createTimeStart}
+            </if>
+            <if test="param.createTimeEnd != null and param.createTimeEnd != null">
+                and lmo.create_time &lt;= #{param.createTimeEnd}
+            </if>
         </where>
             order by create_time desc
     </select>

front/src/main/java/com/hcy/front/service/impl/UserServiceImpl.java

@@ -10,8 +10,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.hcy.common.config.GlobalConfig;
 import com.hcy.common.constant.GlobalConstant;
+import com.hcy.common.entity.client.Client;
 import com.hcy.common.entity.client.ClientContacts;
 import com.hcy.common.entity.distribution.Distributor;
+import com.hcy.common.entity.plant.Plant;
 import com.hcy.common.entity.staff.Staff;
 import com.hcy.common.entity.system.SystemAuthAdmin;
 import com.hcy.common.entity.system.SystemAuthRole;
@@ -21,7 +23,9 @@ import com.hcy.common.enums.NoticeEnum;
 import com.hcy.common.enums.user.SystemAuthRoleEnum;
 import com.hcy.common.exception.OperateException;
 import com.hcy.common.mapper.client.ClientContactsMapper;
+import com.hcy.common.mapper.client.ClientMapper;
 import com.hcy.common.mapper.distribution.DistributorMapper;
+import com.hcy.common.mapper.plant.PlantMapper;
 import com.hcy.common.mapper.staff.StaffMapper;
 import com.hcy.common.mapper.system.SystemAuthAdminMapper;
 import com.hcy.common.mapper.system.SystemAuthRoleMapper;
@@ -63,6 +67,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Resource
     DistributorMapper distributorMapper;
 
+    @Resource
+    PlantMapper plantMapper;
+
+    @Resource
+    ClientMapper clientMapper;
+
     @Resource
     ClientContactsMapper clientContactsMapper;
 
@@ -147,6 +157,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             }
             vo.setRoleMap(roleMap);
         }
+        //返回客户名称
+        Client clientName = clientMapper.selectOne(new LambdaQueryWrapper<Client>()
+                .eq(Client::getId, vo.getClientId()));
+        if(clientName != null){
+            vo.setClientName(clientName.getClientName());
+        }
+
+        //管辖工厂名称
+        Plant plantName = plantMapper.selectOne(new LambdaQueryWrapper<Plant>()
+                .eq(Plant::getId, authAdmin.getPlantId()));
+        if(plantName != null){
+            vo.setPlantName(plantName.getName());
+        }
 
         return vo;
     }

front/src/main/java/com/hcy/front/vo/user/UserCenterVo.java

@@ -32,5 +32,7 @@ public class UserCenterVo implements Serializable {
     private String district;       //区
     private String technicalGrade; // 技术等级
     private Long warehouseId; // 仓库id
+    private String clientName; // 客户名称
+    private String plantName; // 管辖工厂名称
 
 }