Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into dev

youxiw2000
2 parents 2c8cea25 c6d0a4d5
Showing 15 changed files with 291 additions and 3 deletions
trash-framework/src/main/java/com/trash/framework/config/SecurityConfig.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchHandlerMapper.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchHandlerService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchHandlerServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarTransportationEnterpriseServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMatchHandlerMapper.xml
trash-ui/src/router/index.js
trash-ui/src/views/ask/ask/orderDetail.vue
trash-unit/src/main/java/com/trash/dropPointInfo/mapper/DropPointInfoMapper.java
trash-unit/src/main/java/com/trash/dropPointInfo/service/IDropPointInfoService.java
trash-unit/src/main/java/com/trash/dropPointInfo/service/impl/DropPointInfoServiceImpl.java
trash-unit/src/main/resources/mapper/unit/DropPointInfoMapper.xml
@@ -125,6 +125,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
 //                .antMatchers("/user/logout").anonymous()
                 .antMatchers("/system/post/all").anonymous()
                 .antMatchers("/system/user/all").anonymous()
+                .antMatchers("/order/queryByCarCode").anonymous()
 //                .antMatchers("/workflow/add").anonymous()//测试
 //                .antMatchers("/workflow/addtest").anonymous()//测试
                 // 除上面外的所有请求全部需要鉴权认证
@@ -74,6 +74,8 @@ public class GarbageOrderController {
     private final static Integer[] USER_TYP_SELF_COMPANY = {2, 3};
     @Autowired
     private GarAddressService garAddressService;
+    @Autowired
+    private GarOrderMatchHandlerService garOrderMatchHandlerService;
     @PostMapping("/add")
     @Log(title = "创建订单", businessType = BusinessType.INSERT)
@@ -321,7 +323,14 @@ public class GarbageOrderController {
     @GetMapping("/webDetail/{id}")
     public Result<OrderDetailVo> queryOrderWebDetail(@PathVariable("id") String id) {
-        return Result.OK(garOrderService.queryOrderWebDetail(id));
+                System.out.println("进入");
+        return Result.OK(garOrderService.queryOrderDetail(id));
+    }
+
+    @GetMapping("/queryByCarCode/{carCode}")
+    public Result<String> queryByCarCode(@PathVariable("carCode") String carCode) {
+                System.out.println("进入2");
+        return Result.OK(garOrderMatchHandlerService.queryOrderNo(carCode));
     }
     @GetMapping("/evaluate/detail/{orderId}")
@@ -20,6 +20,8 @@ public interface GarOrderMatchHandlerMapper extends BaseMapper&lt;GarOrderMatchHand
     List<DispatchDriverVo> queryDriverListWithDispatchStatus(@Param("orderId") String orderId, @Param("companyId") String id,@Param("containerVolumees") Set<String> containerVolumees);
     List<GarOrderMatchHandler> queryGarOrderMatchHandler(@Param("orderId") String orderId);
+
+    String queryOrderNo(@Param("carCode") String carCode);
 }
@@ -16,4 +16,5 @@ public interface GarOrderMatchHandlerService extends IService&lt;GarOrderMatchHandl
     List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, String companyId, Set<String> containerVolumees);
     List<GarOrderMatchHandler> queryByOrderId(String orderId);
+    String queryOrderNo(String carCode);
 }
@@ -32,6 +32,11 @@ public class GarOrderMatchHandlerServiceImpl extends ServiceImpl&lt;GarOrderMatchHa
         wrapper.eq(GarOrderMatchHandler::getGarOrderId,orderId);
         return list(wrapper);
     }
+
+    @Override
+    public String queryOrderNo(String carCode) {
+        return baseMapper.queryOrderNo(carCode);
+    }
 }
@@ -397,6 +397,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             }
         }
         // 企业负责人
+
+
         else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())) {
             PageHelper.startPage(pageNo, pageSize);
             LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
@@ -40,6 +40,7 @@ public class GarTransportationEnterpriseServiceImpl implements GarTransportation
         if (StringUtils.isNotEmpty(name)) {
             params.put("name", name);
         }
+        System.out.println(HttpUtil.doGet("/api/gpsservice/cs/companies/simple/list?tag=1", params));
         return HttpUtil.doGet("/api/gpsservice/cs/companies/simple/list?tag=1", params);
     }
@@ -69,7 +70,7 @@ public class GarTransportationEnterpriseServiceImpl implements GarTransportation
                         transportationEnterprise.setName(jsonObject.getString("name"));
                         transportationEnterprise.setAbbreviation(jsonObject.getString("abbreviation"));
                         transportationEnterprise.setOfficeAddress(jsonObject.getString("officeAddress"));
-                        transportationEnterprise.setServicePhone(jsonObject.getString("principalPhoneNo"));
+                        transportationEnterprise.setServicePhone(jsonObject.getString("servicePhone"));
                         transportationEnterprise.setLegalRepresentative(jsonObject.getString("principal"));
                         transportationEnterprise.setLegalRepresentativePhone(jsonObject.getString("principalPhoneNo"));
                         list.add(transportationEnterprise);
@@ -113,6 +113,10 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     @Override
     public LoginVo login(LoginDto loginDto) {
         LoginVo vo = new LoginVo();
+        String dropPhone = dropPointInfoService.selectPhoneByDropPointNo(loginDto.getTel());
+        if(dropPhone != null && !dropPhone.isEmpty()){
+            loginDto.setTel(dropPhone);
+        }
         if(loginDto.getSignin() == 1){
         	 QueryWrapper<GarUser> qw = new QueryWrapper<>();
@@ -297,6 +301,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     public String sendVerify(String tel) throws ClientException {
         //随机生成6位数字验证码
         String validateCode = ValidateCodeUtil.generatorCode(4);
+        System.out.println(validateCode);
         //给用户发送验证码
         smsUtils.sendMessage(tel, validateCode.toString());
         // 保存redis
@@ -69,4 +69,16 @@
         select * from gar_order_match_handler where gar_order_id = #{orderId}
     </select>
+    <select id="queryOrderNo" resultType="string">
+        	SELECT
+                gar_order_id
+            FROM
+                gar_order_match_handler
+            WHERE
+                gar_handler_car_code = #{carCode}
+            AND gar_order_handler_status != 3
+            ORDER BY gar_create_time DESC
+            limit 1
+    </select>
+
 </mapper>
@@ -65,7 +65,25 @@ export const constantRoutes = [
       }
     ]
   },
-
+ {
+    path: '/ask',
+    component: Layout,
+    redirect: '/ask/list',
+    name: 'Ask',
+    meta: {
+      title: '电子联单',
+      icon: 'form'
+    },
+    children: [
+      {
+        path: 'orderDetail/:orderId',
+        name: 'OrderDetail',
+        component: () => import('@/views/ask/ask/orderDetail.vue'),
+        meta: { title: '订单详情', icon: 'detail' },
+        props: true
+      }
+    ]
+  },
   {
     path: '/user',
     component: Layout,
+
+<template>
+  <div class="order-detail-container">
+    <div class="header">
+      <h1>装修垃圾收运处电子联单</h1>
+    </div>
+
+    <div class="order-info">
+      <div class="order-number">
+        <span>联单编号：<span class="highlight">{{ form.garOrderNumber }}</span></span>
+      </div>
+
+      <table class="detail-table">
+        <!-- 投放端信息 -->
+        <tr>
+          <td colspan="4" class="section-header">
+            投放端信息
+          </td>
+        </tr>
+        <tr>
+          <td class="label">投放点编号</td>
+          <td>{{ form.dropPointId || '-' }}</td>
+          <td class="label">运距</td>
+          <td>{{ form.transportDistance || '-' }}</td>
+        </tr>
+        <tr>
+          <td class="label">投放点名称</td>
+          <td>{{ form.garOrderName || '-' }}</td>
+          <td class="label">订单时间</td>
+          <td>{{ form.garOrderTime || '-' }}</td>
+        </tr>
+        <tr>
+          <td class="label">联系电话</td>
+          <td>{{ form.garOrderPhone || '-' }}</td>
+          <td class="label">车次</td>
+          <td v-if="form.dropCarNum!==0">{{ form.dropCarNum }}/{{ dropCarNum }}</td>
+          <td v-else>-</td>
+        </tr>
+        <tr>
+          <td class="label">投放地址</td>
+          <td colspan="3">{{ form.dropAddress || '-' }}</td>
+        </tr>
+
+        <!-- 运输端信息 -->
+        <tr>
+          <td colspan="4" class="section-header">
+            运输端信息
+          </td>
+        </tr>
+        <tr>
+          <td class="label">运输单位</td>
+          <td>{{ form.garOrderHandlerCompanyName || '-' }}</td>
+          <td class="label">运输时间</td>
+          <td>{{ form.garCreateTime || '-' }}</td>
+        </tr>
+        <tr>
+          <td class="label">车牌号</td>
+          <td>{{ form.garCarCode || '-' }}</td>
+          <td class="label">驾驶员</td>
+          <td>{{ form.garOrderHandlerName || '-' }}</td>
+        </tr>
+
+        <!-- 处置端信息 -->
+        <tr>
+          <td colspan="4" class="section-header">
+            处置端信息
+          </td>
+        </tr>
+        <tr>
+          <td class="label">处置场名称</td>
+          <td>{{ form.disposalSiteName || '-' }}</td>
+          <td class="label">接收时间</td>
+          <td>{{ form.garUpdateTime || '-' }}</td>
+        </tr>
+        <tr>
+          <td class="label">接收车牌</td>
+          <td>{{ form.garHandlerCarCode || '-' }}</td>
+          <td class="label">载重(吨)</td>
+          <td>{{ form.garCarryingWeight || '-' }}</td>
+        </tr>
+
+        <!-- 备注 -->
+        <tr>
+          <td class="label">备注</td>
+          <td colspan="3">{{ form.garRemark || '-' }}</td>
+        </tr>
+      </table>
+    </div>
+
+    <div class="actions">
+      <el-button type="primary" @click="handlePrint">打印</el-button>
+      <el-button type="primary" @click="exportToPDF">导出PDF</el-button>
+    </div>
+  </div>
+</template>
+
+<script>import { getAsk } from "@/api/ask/ask";
+import html2pdf from 'html2pdf.js'
+
+export default {
+  name: "OrderDetail",
+  data() {
+    return {
+      // 表单参数
+      form: {},
+      dropCarNum: 0
+    };
+  },
+  created() {
+    const orderId = this.$route.params.orderId || this.$route.query.orderId;
+    if (orderId) {
+      this.getOrderDetail(orderId);
+    } else {
+      this.$message.error("缺少订单ID参数");
+    }
+  },
+  methods: {
+    /** 获取订单详情 */
+    getOrderDetail(orderId) {
+      getAsk(orderId).then(response => {
+        this.form = response.data;
+      }).catch(error => {
+        this.$message.error("获取订单详情失败: " + error.message);
+      });
+    },
+
+    /** 导出为PDF */
+    exportToPDF() {
+      const element = document.querySelector('.order-detail-container');
+
+      const opt = {
+        margin:       10,
+        filename:     `装修垃圾收运处电子联单_${this.form.garOrderNumber}.pdf`,
+        image:        { type: 'jpeg', quality: 0.98 },
+        html2canvas:  { scale: 2 },
+        jsPDF:        { unit: 'mm', format: 'a4', orientation: 'portrait' }
+      };
+
+      html2pdf().set(opt).from(element).save();
+    },
+
+    /** 打印 */
+    handlePrint() {
+      window.print();
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>.order-detail-container {
+  max-width: 1000px;
+  margin: 0 auto;
+  padding: 20px;
+  background: #fff;
+
+  .header {
+    text-align: center;
+    margin-bottom: 20px;
+
+    h1 {
+      font-size: 24px;
+      color: #333;
+      margin: 0;
+    }
+  }
+
+  .order-info {
+    .order-number {
+      font-size: 18px;
+      margin-bottom: 20px;
+
+      .highlight {
+        color: red;
+        font-weight: bold;
+      }
+    }
+
+    .detail-table {
+      width: 100%;
+      border-collapse: collapse;
+      font-size: 14px;
+      text-align: left;
+      margin-bottom: 20px;
+
+      .section-header {
+        background: #f5f7fa;
+        font-weight: 600;
+        padding: 10px;
+      }
+
+      td {
+        border: 1px solid #333;
+        padding: 10px;
+
+        &.label {
+          background-color: #f9f9f9;
+          font-weight: 500;
+          width: 20%;
+        }
+      }
+    }
+  }
+
+  .actions {
+    text-align: center;
+
+    .el-button {
+      margin: 0 10px;
+    }
+  }
+}
+
+@media print {
+  .actions {
+    display: none;
+  }
+}
+</style>
@@ -19,6 +19,9 @@ public interface DropPointInfoMapper
      */
         DropPointInfo selectDropPointInfoById(Long id);
+
+        String selectPhoneByDropPointNo(String dropPointNo);
+
     /**
      * 查询投放点信息管理列表
      * 
@@ -19,6 +19,8 @@ public interface IDropPointInfoService
      */
         DropPointInfo selectDropPointInfoById(Long id);
+        String selectPhoneByDropPointNo(String dropPointNo);
+
     /**
      * 查询投放点信息管理列表
      * 
@@ -39,6 +39,11 @@ public class DropPointInfoServiceImpl implements IDropPointInfoService
         return dropPointInfoMapper.selectDropPointInfoById(id);
     }
+    @Override
+    public String selectPhoneByDropPointNo(String dropPointNo) {
+        return dropPointInfoMapper.selectPhoneByDropPointNo(dropPointNo);
+    }
+
     /**
      * 查询投放点信息管理列表
      * 
@@ -66,6 +66,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		where custodian_phone = #{custodianPhone}
 	</select>
+	<select id="selectPhoneByDropPointNo" parameterType="String">
+		select custodian_phone from drop_point_info where drop_point_no = #{dropPointNo}
+	</select>
+
 	<select id="selectDropPointInfoById" parameterType="Long"
 		resultMap="DropPointInfoResult">
 		<include refid="selectDropPointInfoVo" />