fix：bug update

aidea-modules/prescription-module-web/src/main/webapp/WEB-INF/views/prescription/prescriptionlist.html

@@ -248,9 +248,9 @@
                     'targets': [8],
                     "mRender": function (a, b, c, d) {
                         if (a == '0') {
-                            return '未审核';
-                        } else if (a == '1') {
                             return '审核通过';
+                        } else if (a == '1') {
+                            return '未审核';
                         } else if (a == '2') {
                             return '审核拒绝';
                         }

aidea-modules/prescription-module/src/main/java/com/cftech/prescription/service/impl/PrescriptionServiceImpl.java

@@ -139,7 +139,7 @@ public class PrescriptionServiceImpl extends GenericServiceImpl<Prescription> im
             retObj.put("errorNo", 1);
             e.printStackTrace();
         }
-        retObj.put("errorNo", 1);
+        retObj.put("errorNo", 0);
         return retObj;
     }
 

aidea-modules/product-module/src/main/java/com/cftech/product/dao/ProductMapper.xml

@@ -174,7 +174,7 @@
         #{isreading, jdbcType=BIGINT},
         #{unit,jdbcType=VARCHAR},
         #{invoiceCode,jdbcType=VARCHAR},
-        #{deviation, jdbcType=BIGINT}
+        #{deviation, jdbcType=BIGINT},
         #{uploadFlag, jdbcType=TINYINT}
         )
     </insert>
@@ -381,7 +381,7 @@
                 invoice_code = #{invoiceCode , jdbcType=VARCHAR},
             </if>
             <if test="deviation != null">
-                deviation = #{deviation, jdbcType=BIGINT}
+                deviation = #{deviation, jdbcType=BIGINT},
             </if>
             <if test="uploadFlag != null">
                 upload_flag = #{uploadFlag, jdbcType=TINYINT}

aidea-modules/product-module/src/main/java/com/cftech/product/web/ProductController.java

@@ -182,7 +182,7 @@ public class ProductController {
         return rtnJosn;
     }
 
-    //删除数据
+    //药品上传
     @RequiresPermissions(value = PRODUCT_EDIT)
     @RequestMapping("/uploadPlatform")
     @ResponseBody

cftech-common-web/src/main/resources/common-test.properties

@@ -86,7 +86,7 @@ jwt.duration=86400000
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue
 security.secure=false
 #\u662F\u5426\u96C6\u7FA4 master\u4E3Atrue
-quartz.isCluster=true
+quartz.isCluster=false
 
 #\u987A\u4E30\u7269\u6D41\u914D\u7F6E\u4FE1\u606F\u53C2\u6570
 #\u987A\u4E30\u5BA2\u6237\u7F16\u7801

cftech-common-web/src/main/resources/common.properties

@@ -144,22 +144,24 @@ map.key=OPIBZ-VYIW2-CK7UO-CM4WN-ELY2K-EUFYP
 #\u7B7E\u540D\u5BC6\u94A5
 map.secret_key=W1je0RfMuDsfxCy73M0b3iEfZRF5cAcU
 
-#\u5fae\u95ee\u8bca\u914d\u7f6e\u53c2\u6570
-#\u83b7\u53d6\u0074\u006f\u006b\u0065\u006e\u5730\u5740
+#\u5FAE\u95EE\u8BCA\u914D\u7F6E\u53C2\u6570
+#\u83B7\u53D6token\u5730\u5740
 cdfortis.token_url=https://api.cdfortis.com/api/verify/token?appid={appid}&flag={flag}&timestamp={timestamp}&sign={sign}
-#\u5fae\u95ee\u8bca\u0061\u0070\u0070\u0069\u0064
+#\u5FAE\u95EE\u8BCAappid
 cdfortis.appid=74523ca670a6ceab8095a7476805c649
-#\u5fae\u95ee\u8bca\u0073\u0065\u0063\u0072\u0065\u0074
+#\u5FAE\u95EE\u8BCAsecret
 cdfortis.secret=c2cf8d3e9a6c715a8046541bf397ccc6
-#\u5fae\u95ee\u8bca\u0066\u006c\u0061\u0067
-cdfortis.flag=aidea888
-#\u5fae\u95ee\u8bca\u836f\u54c1\u6e05\u5355\u4e0a\u4f20\u63a5\u53e3\u5730\u5740
+#\u5FAE\u95EE\u8BCAflag
+cdfortis.flag=wxc43bd62c1
+#\u5FAE\u95EE\u8BCA\u836F\u54C1\u6E05\u5355\u4E0A\u4F20\u63A5\u53E3\u5730\u5740
 cdfortis.drug_upload_url=https://api.cdfortis.com/api/drug/chain
-#\u5fae\u95ee\u8bca\u83b7\u53d6\u56fe\u6587\u5904\u65b9\u5217\u8868\u63a5\u53e3
+#\u5FAE\u95EE\u8BCA\u83B7\u53D6\u56FE\u6587\u5904\u65B9\u5217\u8868\u63A5\u53E3
 cdfortis.get_fbusi_list_url=https://api.cdfortis.com/api/fbusi/getFbusiList
-#\u5fae\u95ee\u8bca\u83b7\u53d6\u56fe\u6587\u5904\u65b9\u56fe\u7247\u63a5\u53e3
+#\u5FAE\u95EE\u8BCA\u83B7\u53D6\u56FE\u6587\u5904\u65B9\u56FE\u7247\u63A5\u53E3
 cdfortis.get_fbusi_pic_url=https://api.cdfortis.com/api/fbusi/getFbusiPicture
-#\u5fae\u95ee\u8bca\u83b7\u53d6\u5355\u6761\u56fe\u6587\u5904\u65b9\u8be6\u60c5\u63a5\u53e3
+#\u5FAE\u95EE\u8BCA\u83B7\u53D6\u5355\u6761\u56FE\u6587\u5904\u65B9\u8BE6\u60C5\u63A5\u53E3
 cdfortis.get_fbusi_info_url=https://api.cdfortis.com/api/fbusi/getFbusiInfo
-#\u5fae\u95ee\u8bca\u901a\u8fc7\u8ba2\u5355\u53f7\u56fe\u6587\u5904\u65b9\u8be6\u60c5
-cdfortis.get_fbusi_info_by_order_id_url=https://api.cdfortis.com/api/fbusi/getFbusiInfoByOrderId
\ No newline at end of file
+#\u5FAE\u95EE\u8BCA\u901A\u8FC7\u8BA2\u5355\u53F7\u56FE\u6587\u5904\u65B9\u8BE6\u60C5
+cdfortis.get_fbusi_info_by_order_id_url=https://api.cdfortis.com/api/fbusi/getFbusiInfoByOrderId
+#\u5FAE\u95EE\u8BCA\u95E8\u5E97\u7F16\u7801
+cdfortis.store_no=wxc43bd62c1
\ No newline at end of file

qy-modules/qyapi-module/src/main/java/com/cftech/base/org/api/QyMediaUtil.java

 package com.cftech.base.org.api;
 
-import bsh.StringUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.cftech.accounts.model.MpAccountsEntity;
 import com.cftech.core.constants.MpApiConstants;