zjh20250715-2

zjh

12 小时以前 62eb109ad2041c38df8f48d41b95a85d2dc44cb7

zjh20250715-2

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java

@@ -2923,10 +2923,12 @@
            for (TbTransition tbTransition : list) {
                if (tbTransition.getParentProId().toString().equals(project.getProId().toString())) {
                    JSONObject obj = JSONUtil.createObj();
                    TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, tbTransition.getParentProId().toString());
                    obj.putOpt("index", index++);
                    obj.putOpt("parent_pro_name", tbTransition.getParentProName());
                    obj.putOpt("price", tbTransition.getOrdPrice());
                    obj.putOpt("ks", dept.getDeptName());
                   if(null !=remark) obj.putOpt("sfzt", remark.getSfbz());
                    huiZong.add(obj);
                }
            }

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java

@@ -26,7 +26,7 @@
    @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND deleted='0'")
    List<TjOrderRemark> getTjOrderRemarkListByTjNum(String tjNumber);

    @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND pro_id=#{proParentId} AND deleted='0'")
    @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND pro_id=#{proParentId} AND deleted=0 ")
    TjOrderRemark getTjOrderRemarkByTjNumAndProParentId(@Param("tjNumber") String tjNumber, @Param("proParentId") String proParentId);

    @Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type IN (0,3) AND deleted=0")