bug修复

src/custom/restcontroller/sale/customer/Hospital.java

@@ -701,7 +701,10 @@ public class Hospital extends Controller {
         // 商品品牌
         RowsMap brandRowsMap = Brand.getBrandRowsMap(this, ids);
         RowsMap itemclassRowsMap = ItemClass.getAllItemClassRowsMap(this, ids);
+        //查询附件
+        RowsMap attinfoRowsMap = getAttachmentUrl("plm_item", ids);
         for (Row row : rows) {
+            row.put("attinfos", attinfoRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             Rows brandRows = brandRowsMap.getOrDefault(row.getString("itemid"), new Rows());
             Rows itemclassRows = itemclassRowsMap.getOrDefault(row.getString("itemid"), new Rows());
             row.put("brandname", StringUtils.join(brandRows.toArray("brandname"), ","));

src/custom/restcontroller/webmanage/saletool/orderclue/ordercluecampaign.java

@@ -181,7 +181,7 @@ public class ordercluecampaign extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t3", "t3.sys_enterpriseid=t2.sys_enterpriseid and t3.siteid=t2.siteid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_hospitaldep", "t4", "t4.sa_hospitaldepid=t1.sa_hospitaldepid and t4.siteid=t1.siteid",
                 "hospitaldepname");
-        querySQL.addQueryFields("hospitalname","t3.enterprisename");
+        querySQL.addQueryFields("hospitalname", "t3.enterprisename");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t1.sat_campaignid=" + sat_campaignid);
         Rows rows = querySQL.query();
@@ -203,14 +203,14 @@ public class ordercluecampaign extends Controller {
                 "hospitaldepname");
         doctorQuerySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t4", "t4.sa_customersid=t3.sa_customersid and t4.siteid=t3.siteid");
         doctorQuerySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid");
-        doctorQuerySQL.addQueryFields("hospitalname","t5.enterprisename");
+        doctorQuerySQL.addQueryFields("hospitalname", "t5.enterprisename");
         doctorQuerySQL.setSiteid(siteid);
         doctorQuerySQL.setWhere("t1.sat_campaignid=" + sat_campaignid);
         Rows doctorRows = doctorQuerySQL.query();
         row.put("doctors", doctorRows);
 
-        BigDecimal doctorAmount=doctorRows.sum("amount");
-        BigDecimal actualAmount=doctorAmount.add(row.getBigDecimal("otheramount"));
+        BigDecimal doctorAmount = doctorRows.sum("amount");
+        BigDecimal actualAmount = doctorAmount.add(row.getBigDecimal("otheramount"));
         row.put("doctorAmount", doctorAmount);
         row.put("actualAmount", actualAmount);
 
@@ -222,26 +222,12 @@ public class ordercluecampaign extends Controller {
     public String delete() throws YosException {
         Long sat_campaignid = content.getLong("sat_campaignid");
 
-        Rows rowscount = dbConnect.runSqlQuery("select status from sat_campaign where siteid='" + siteid + "' and  sat_campaignid=" + sat_campaignid);
-        Rows orderclueRows = dbConnect.runSqlQuery("select sat_orderclueid from sat_orderclue where siteid='" + siteid + "' and deleted=0 and sat_campaignid=" + sat_campaignid);
-        if (rowscount.isEmpty()) {
-            return getReturnObject().setCode("0603", new String[0]).toString();//此活动不存在，无法删除
-        } else {
-            if (rowscount.get(0).getString("status").equals("发布")) {
-                return getReturnObject().setCode("0604", new String[0]).toString();//已发布的活动无法删除
-            }
-            if (orderclueRows.isNotEmpty()) {
-                return getReturnObject().setCode("0605", new String[0]).toString();//活动中存在线索无法删除
-            }
-        }
-//        String sql = "DELETE FROM sat_campaign WHERE sat_campaignid = '" + sat_campaignid + "'";
-//        dbConnect.runSqlUpdate(sql);
-
         DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(this, "sat_campaign");
         deleteSQL.setSiteid(siteid);
         deleteSQL.setWhere("sat_campaignid", sat_campaignid);
         deleteSQL.delete();
 
+        DataContrlLog.createLog(this, "sat_campaign", sat_campaignid, "删除活动", "删除活动成功").insert();
         return getSucReturnObject().toString();
 
     }
@@ -250,15 +236,12 @@ public class ordercluecampaign extends Controller {
     @CACHEING_CLEAN(cms = {@cm(clazz = ordercluecampaign.class, method = {"queryCampaignList"})})
     public String deleteManager() throws YosException {
         Long sat_campaignid = content.getLong("sat_campaignid");
-        Rows rowscount = dbConnect.runSqlQuery("select status from sat_campaign where siteid='" + siteid + "' and  sat_campaignid=" + sat_campaignid);
-        if (rowscount.isEmpty()) {
-            return getReturnObject().setCode("0603", new String[0]).toString();//此活动不存在，无法删除
-        }
         DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(this, "sat_campaign");
         deleteSQL.setSiteid(siteid);
         deleteSQL.setWhere("sat_campaignid", sat_campaignid);
         deleteSQL.delete();
 
+        DataContrlLog.createLog(this, "sat_campaign", sat_campaignid, "删除医生", "删除活动成功").insert();
         return getSucReturnObject().toString();
     }