代码整理

src/apps/salogis/salogis.java

@@ -238,7 +238,7 @@ public class salogis extends PaoCust {
                 PaoRemote tagent = getPaoSet("tagents").getPao(0);
                 PaoSetRemote tagents_fieldSet = tagent.getPaoSet("TAGENTS_FIELD");
                 String fsalers[] = getStrings(tagents_fieldSet, "hrid");
-                sendEmail(getMailByHrId(fsalers), tagent.getString("FAGENTSHORTNAME") + "物流单已审核", "【物流单审核】物流单：" + getString("fbillnum") + ",订单客户：" + tagent.getString("FAGENTSHORTNAME") + "已审核完成");
+                //sendEmail(getMailByHrId(fsalers), tagent.getString("FAGENTSHORTNAME") + "物流单已审核", "【物流单审核】物流单：" + getString("fbillnum") + ",订单客户：" + tagent.getString("FAGENTSHORTNAME") + "已审核完成");
 
                 //业务员邮件提醒
                 if (getString("siteid").equalsIgnoreCase("TZ")) {

src/rest/openapi/restcontroller/wechatapp/system/SQL/附件信息插入.sql

@@ -12,7 +12,8 @@ INSERT INTO tattachment
 , fobsurl
 , fobsurl_minimage
 , mpctaskid
-, contentlength)
+, contentlength
+, rmkenable)
 VALUES ($tattachmentid$
        , $siteid$
        , $ownerid$
@@ -26,4 +27,5 @@ VALUES ($tattachmentid$
        , $fobsurl$
        , $fobsurl_minimage$
        , $mpctaskid$
-       , $contentlength$)
+       , $contentlength$
+       ,0 )

src/rest/openapi/restcontroller/wechatapp/tproject/tools/TprojectTool.java

@@ -90,7 +90,7 @@ public class TprojectTool extends BaseClass {
                 fenddate = fenddate.substring(0, 10);
             }
 
-            Rows probjectcheck = new DBConnect().runSqlQuery("select * from tproject where fieldname='"+fieldname+"' and fstatus='审核' and fprojectname like'%" + fprojectname + "%' and " +
+            Rows probjectcheck = new DBConnect().runSqlQuery("select * from tproject where fieldname='" + fieldname + "' and fstatus='审核' and fprojectname like'%" + fprojectname + "%' and " +
                     "((fbegdate<='" + fbegdate + "' and fenddate>='" + fbegdate + "' ) or (fbegdate<='" + fenddate + "' and fenddate>='" + fenddate + "' )) ");
             if (!probjectcheck.isEmpty()) {
                 return "当前项目有效期内已存在审核的项目报备";
@@ -126,7 +126,7 @@ public class TprojectTool extends BaseClass {
             String fbuildarea = nullToStr(content.getString("fbuildarea"));
             String fphonenumber = nullToStr(content.getString("fphonenumber"));
             String fnotes = nullToStr(content.getString("fnotes"));
-            String fislimititem = content.getString("fislimititem");
+            String fislimititem = nullToStr(content.getString("fislimititem"));
 
             tproject.setValue("fbegdate", fbegdate, 11L);
             tproject.setValue("fenddate", fenddate, 11L);

src/rest/openapi/tools/obs/BucketFile.java

@@ -55,8 +55,7 @@ public class BucketFile extends Bucket {
      * @param objectname
      */
     public void deleteFile(String objectname) {
-        DeleteObjectResult deleteObjectResult = obsClient.deleteObject(bucketname, objectname);
-        System.err.println(deleteObjectResult);
+        obsClient.deleteObject(bucketname, objectname);
         if (obsClient.doesObjectExist(bucketname, "s_" + objectname)) {
             obsClient.deleteObject(bucketname, "s_" + objectname);
         }