审批流附件字段判断标准

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -705,7 +705,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
             PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
             PushManager.resumeWork(MyApplication.getInstance());
         }
-        doSendSignAutoLog(); // 获取数据库中监控日志上传至服务器操作
+//        doSendSignAutoLog(); // 获取数据库中监控日志上传至服务器操作
         //桌面红点显示逻辑
         if (OAConfig.canShowRed) {
             if (handler == null) {

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Jun 17 14:22:09 CST 2019
+#Mon Jun 17 18:31:03 CST 2019
 debugName=972
-versionName=685
+versionName=686
 debugCode=972
-versionCode=240
+versionCode=241

app_core/common/src/main/java/com/core/model/Approval.java

@@ -49,6 +49,7 @@ public class Approval {
     private String values = "";//字幕对应的值显示
     private String oldValues = "";//变更前的值
     private String valuesKey = "";//字幕对应的值显示的key值
+    private String renderer = "";
     private List<Data> datas = new ArrayList<>();
 
     public Approval(@Duration int type) {
@@ -151,7 +152,7 @@ public class Approval {
             }
             if (!StringUtil.isEmail(v2)) {
                 int floatcolumn = floatcolumn();//保留小数后几位
-                LogUtil.i("gong",values+"="+floatcolumn);
+                LogUtil.i("gong", values + "=" + floatcolumn);
                 if (floatcolumn == 0) {
                     if (v2.length() - 1 > 2) {
                         builder.append(v2.substring(0, 2));
@@ -161,7 +162,7 @@ public class Approval {
                 } else {
                     //计算小数点后几位
                     if (v2.length() > floatcolumn) {
-                        builder.append(v2.substring(0,Math.min( floatcolumn+1,v2.length())));
+                        builder.append(v2.substring(0, Math.min(floatcolumn + 1, v2.length())));
                     } else {
                         builder.append(v2);
                     }
@@ -185,6 +186,14 @@ public class Approval {
         this.valuesKey = valuesKey;
     }
 
+    public String getRenderer() {
+        return renderer;
+    }
+
+    public void setRenderer(String renderer) {
+        this.renderer = renderer;
+    }
+
     public List<Data> getDatas() {
         return datas;
     }

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/ApprovaPresenter.java

@@ -871,6 +871,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
             if (!isMain) {
                 String findTionName = JSONUtil.getText(config, "DG_FINDFUNCTIONNAME");
                 String renderer = JSONUtil.getText(config, "DG_RENDERER");
+                approval.setRenderer(renderer);
                 if (!StringUtil.isEmpty(findTionName) && findTionName.contains("|")) {
                     int hhitem = findTionName.indexOf('|');
                     String gCaller = findTionName.substring(0, hhitem);
@@ -914,7 +915,9 @@ public class ApprovaPresenter implements OnHttpResultListener {
                 setData2ListThread();
                 continue;
             }
-            if (approval.isDftypeEQ("FF") || (record.title.contains("公章用印申请流程") && "附件".equals(caption))) {
+            if (approval.isDftypeEQ("FF")
+                    || ("detailAttach".equals(approval.getRenderer()))
+                    || (record.title.contains("公章用印申请流程") && "附件".equals(caption))) {
                 if (isMain) {
                     final String fb_attach = newValues;
                     OAHttpHelper.getInstance().post(new Runnable() {

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceManageActivity.java

@@ -36,7 +36,7 @@ public class DeviceManageActivity extends SupportToolBarActivity {
     }
 
     private void initView() {
-        contantRv =findViewById(R.id.contantRv);
+        contantRv = findViewById(R.id.contantRv);
         contantRv.setLayoutManager(new GridLayoutManager(ct, 4));
         List<DeviceManage> models = new ArrayList<>();
         //扫一扫
@@ -75,7 +75,7 @@ public class DeviceManageActivity extends SupportToolBarActivity {
             if (bundle != null) {
                 intent.putExtra("data", bundle);
                 if (bundle.keySet() != null) {
-                    for (String e : bundle.keySet()){
+                    for (String e : bundle.keySet()) {
                         intent.putExtra(e, bundle.getString(e));
                     }
                 }
@@ -114,7 +114,6 @@ public class DeviceManageActivity extends SupportToolBarActivity {
                 }
             } else if (requestCode == 0x22) {
                 showDialog(data.getStringExtra("data"));
-
             }
         }
     }