xinzeng jiekou

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -85,6 +85,7 @@ public class BaseRequestMapping {
        public static final String CREATEUP  = "/createUp";
        public static final String changeReceiveState  = "/changeReceiveState";
        public static final String getOutDetailListById  = "/getOutDetailListById";
        public static final String getOutDetailById  = "/getOutDetailById";
        public static final String getOrgListByTown  = "/getOrgListByTown";
        public static final String enableOrDis  = "/enableOrDis";
        public static final String docFullInfo  = "/docFullInfo";

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineOutEndpoint.java

@@ -29,6 +29,9 @@ public class MedicineOutEndpoint extends EnvelopRestEndpoint {
    @Autowired
    MedicineStockOutService stockoutService;
    @Autowired
    MedicineStockOutService outDetailService;
    @Autowired
    private MedicineOrderService orderservice;
    @Autowired
@@ -133,6 +136,20 @@ public class MedicineOutEndpoint extends EnvelopRestEndpoint {
        return success(baseDoctors, Mediicinestockoutdetail.class);
    }
    @GetMapping(value = BaseRequestMapping.BaseOut.getOutDetailById)
    @ApiOperation(value = "出货单id获取出货详细信息" , notes="获取药品出货详细信息")
    public Envelop getUpDetailById(
            @ApiParam(name = "idOut", value = "出货单id", required = true)
            @RequestParam(value = "idOut") String idOut) throws Exception {
        JSONObject result = new JSONObject();
        JSONObject jsonObject = outDetailService.getOutDetailById(idOut);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getJSONObject("msg"));
    }
    @ApiOperation(value = "读出货单列表", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/list")
    public List<Mediicinestockout> list(){

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineStockOutService.java

@@ -285,4 +285,20 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
    public List<Mediicinestockoutdetail> getoutdetail(String idstockout) {
        return   outdetailDao.getoutdetail(idstockout);
    }
    public JSONObject getOutDetailById(String idstockout) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(idstockout)){
            result.put("msg","idstockout is null");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("info", outDao.findOne(idstockout));
        jsonObject.put("list", outdetailDao.getoutdetail(idstockout));
        result.put("msg", jsonObject);
        result.put("response", ConstantUtils.SUCCESS);
        return result;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -183,23 +183,23 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "    t.ratio as ratio,\n" +
                "    t.cargo_capacity as cargoCapacity\n" +
                "FROM\n" +
                "    t_mediicine_device AS t where 1=1\n";
                "    t_mediicine_device AS t where 1=1 AND t.del = 1\n";
        String conditionSql = "";
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.equ_name, t.equ_num) like '%" + content + "%'";
            conditionSql += " AND CONCAT(t.equ_name, t.equ_num) like '%" + content + "%'";
        }
        if (!StringUtils.isEmpty(equClass)){
            conditionSql += " and t.equ_class = '"+equClass + "'";
            conditionSql += " AND t.equ_class = '"+equClass + "'";
        }
        if (!StringUtils.isEmpty(belongCommunity)){
            conditionSql += " and t.belong_community = '" + belongCommunity+ "'";
            conditionSql += " AND t.belong_community = '" + belongCommunity+ "'";
        }
        if (!StringUtils.isEmpty(networkStatus)){
            conditionSql += " and t.network_status = '" + networkStatus + "'";
            conditionSql += " AND t.network_status = '" + networkStatus + "'";
        }
        if (!StringUtils.isEmpty(saleStatus)){
            conditionSql += " and t.sale_status = '" + saleStatus + "'";
            conditionSql += " AND t.sale_status = '" + saleStatus + "'";
        }
        sql = sql + conditionSql;
@@ -938,10 +938,11 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                stringObjectMap.put("totalQty", childList.stream().reduce(0, (sum,  p) -> sum += Integer.parseInt(p.get("qty").toString()), Integer::sum));
            }
            //历史订单数
            String secondSql = "SELECT COUNT(DISTINCT(t.id)) FROM t_mediicine_order t WHERE t.shipping_equ = '" + stringObjectMap.get("id").toString() + "'";
            stringObjectMap.put("orderQty", jdbcTemplate.queryForObject(secondSql, Integer.class));
            //总销售额
            secondSql = "SELECT SUM(t.amount) FROM t_mediicine_order t WHERE t.shipping_equ = '" + stringObjectMap.get("id").toString() + "'";
            stringObjectMap.put("orderTotalAmount", jdbcTemplate.queryForObject(secondSql, Integer.class));
        }