Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

Merge remote-tracking branch 'origin/master'

 src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java

@@ -269,8 +269,8 @@
                        try {
                            if(allOpeOrder != null && allOpeOrder.size() > 0)
                            {
                                int count = allOpeOrder.size();
                                this.setRowCount(count);
//                                int count = allOpeOrder.size();
                                this.setRowCount(supplierOpeOrderService.SupplierOpeOrderTotal(orderCode,applyCode,status,orderTime,orderEndTime));

                                list = supplierOpeOrderService.getSupplierOpeOrderList(orderCode,applyCode,status,orderTime,orderEndTime,first,pageSize);
                                for (int i=0;i<list.size();i++) {

 src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.java

@@ -15,4 +15,7 @@
    public int updateDestoryFlagById(SupplierOrder supplierOrder);

    SupplierOrder selectById(String id);

    int getSupplierListTotal(Map<String, Object> params);

}

 src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.xml

@@ -94,6 +94,33 @@
    where 1 = 1
    and oo.id = #{id}
  </select>
  <select id="getSupplierListTotal" resultType="java.lang.Integer">
    select (count(0))
    from (
    select count(0)
    from ope_order oo
    LEFT JOIN ope_apply_order oao on oo.id = oao.ope_order_id
    left join ope_apply as oa on oao.ope_apply_id = oa.id
    where 1 = 1
    <if test="code != null and code != ''">
      and oo.order_code like concat('%',#{code},'%')
    </if>
    <if test="status != null">
      and oo.status = #{status}
    </if>
    <if test="orderTime != null">
      and oo.create_time >= #{orderTime}
    </if>
    <if test="orderEndTime != null">
      and #{orderEndTime} >= oo.create_time
    </if>
    <if test="applyCode != null and applyCode != ''">
      and oa.apply_code like concat('%',#{applyCode},'%')
    </if>
    GROUP BY oo.id
    ) as a

  </select>

  <update id="updateDestoryFlagById" parameterType="com.nanometer.smartlab.entity.SupplierOrder">
    update ope_order set destory_flag=1 where id=#{id}

 src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderService.java

@@ -16,4 +16,6 @@
    public void updateDestoryFlagById(SupplierOrder supplierOrder);

    SupplierOrder selectById(String id);

    int SupplierOpeOrderTotal(String orderCode, String applyCode, Integer status, Timestamp orderTime, Timestamp orderEndTime);
}

 src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderServiceImpl.java

@@ -80,4 +80,15 @@
    public SupplierOrder selectById(String id) {
        return supplierOpeOrderDao.selectById(id);
    }

    @Override
    public int SupplierOpeOrderTotal(String orderCode, String applyCode, Integer status, Timestamp orderTime, Timestamp orderEndTime) {
        Map<String, Object> params = new HashMap<String, Object>();
        params.put("code", orderCode);
        params.put("applyCode", applyCode);
        params.put("orderTime",orderTime);
        params.put("orderEndTime",orderEndTime);
        params.put("status", status);
        return this.supplierOpeOrderDao.getSupplierListTotal(params);
    }
}