Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/BankinformationMapper.java

@@ -25,7 +25,7 @@ public interface BankinformationMapper extends CommonBaseMapper<Bankinformation>
     List<Bankinformation> selectBankinformationBycondition(@Param("con") String con, @Param("companyId") Long companyId);
 
     List<ComboDTO> getCombo(@Param("companyId") Long companyId);
-    String selectBankcode(@Param("bk_bankcode") String bk_bankcode, @Param("companyId") Long companyId);
+    int selectBankcode(@Param("bk_bankcode") String bk_bankcode, @Param("id") Long id);
     Long selectBankId(@Param("bk_bankcode") String bk_bankcode, @Param("companyId") Long companyId);
 
     void check(Map<String, Object> map);

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -61,15 +61,13 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         DocBaseDTO docBaseDTO = new DocBaseDTO();
 
         String bk_code = RegexpUtils.replaceSpecCharacter(bankinformation.getBk_bankcode());
-        String code = pushMaxnubmer(bk_code, bankinformation.getId());
+        String code = null;
 
-        String bktion = bankinformationMapper.selectBankcode(bankinformation.getBk_bankcode() ,BaseContextHolder.getCompanyId());
+        int bktion = bankinformationMapper.selectBankcode(bankinformation.getBk_bankcode() ,bankinformation.getId());
         //先判断ID,再判断编号
         if (bankinformation.getId() == 0)
         {
-            if (bktion != null){
-                throw new BizException(500, BizExceptionCode.ACCOUNT_EXISTS.getMessage());
-            }
+            code = pushMaxnubmer(bk_code, bankinformation.getId());
             bankinformation.setBk_thisamount(bankinformation.getBk_beginamount());
             bankinformation.setBk_bankcode(code);
             bankinformationMapper.insertSelective(bankinformation);
@@ -103,15 +101,13 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
                 }
             }
 
-            Long id = bankinformationMapper.selectBankId(bankinformation.getBk_bankcode(), BaseContextHolder.getCompanyId());
-            if (bktion != null){
-                if (id.equals(bankinformation.getId())){
+//            Long id = bankinformationMapper.selectBankId(bankinformation.getBk_bankcode(), BaseContextHolder.getCompanyId());
+            if (bktion > 0){
                     bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
                     messageLogService.update(docBaseDTO);
-                }else {
-                    throw new BizException(500, BizExceptionCode.ACCOUNT_EXISTS.getMessage());
-                }
             }else {
+                code = pushMaxnubmer(bk_code, bankinformation.getId());
+                bankinformation.setBk_bankcode(code);
                 bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
                 messageLogService.update(docBaseDTO);
             }

applications/document/document-server/src/main/resources/mapper/BankinformationMapper.xml

@@ -324,9 +324,9 @@
     </select>
 
 
-  <select id="selectBankcode" resultType="java.lang.String">
-        select bk_bankcode from bankinformation where
-        bk_bankcode = #{bk_bankcode,jdbcType=VARCHAR} and companyId = #{companyId}
+  <select id="selectBankcode" resultType="java.lang.Integer">
+        select count(0) from bankinformation where
+        bk_bankcode = #{bk_bankcode,jdbcType=VARCHAR} and bk_id = #{id}
     </select>
 
   <select id="selectBankId" resultType="java.lang.Long">

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VendorAcountView.java

@@ -21,6 +21,9 @@ public class VendorAcountView {
 
     private String pr_spec;
 
+    private String pr_orispeccode;
+    private String pr_brand;
+
     private String pd_unit;
 
     private Double qty;
@@ -38,6 +41,22 @@ public class VendorAcountView {
     private String pd_remark;
     private int ym;
 
+    public String getPr_orispeccode() {
+        return pr_orispeccode;
+    }
+
+    public void setPr_orispeccode(String pr_orispeccode) {
+        this.pr_orispeccode = pr_orispeccode;
+    }
+
+    public String getPr_brand() {
+        return pr_brand;
+    }
+
+    public void setPr_brand(String pr_brand) {
+        this.pr_brand = pr_brand;
+    }
+
     public int getYm() {
         return ym;
     }

applications/money/money-server/src/main/resources/mapper/PayablesdetailMapper.xml

@@ -36,7 +36,7 @@
         and  companyId = #{companyId} and pd_query =1 and (pd_addpay + pd_addpre + pd_remain) != 0
       </if>
     </where>
-    order by pd_vendname asc, pd_detno asc, pd_date desc
+    order by pd_vendid desc, pd_detno asc, pd_date desc
   </select>
 
   <select id="selectCalculateFields" resultType="string">

applications/money/money-server/src/main/resources/mapper/ReceivablesdetailMapper.xml

@@ -36,7 +36,7 @@
         and  companyId = #{companyId} and rd_query = 1 and (rd_addrec + rd_addpre + rd_remain) != 0
       </if>
     </where>
-    order by rd_custname asc, rd_detno asc, rd_date desc
+    order by rd_custid desc, rd_detno asc, rd_date desc
   </select>
 
   <select id="selectCalculateFields" resultType="string">

applications/money/money-server/src/main/resources/mapper/VendorAcountViewMapper.xml

@@ -12,6 +12,8 @@
     <result column="pr_detail" property="pr_detail" jdbcType="VARCHAR" />
     <result column="pr_spec" property="pr_spec" jdbcType="VARCHAR" />
     <result column="pd_unit" property="pd_unit" jdbcType="VARCHAR" />
+    <result column="pr_brand" property="pr_brand" jdbcType="VARCHAR" />
+    <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR" />
     <result column="qty" property="qty" jdbcType="DOUBLE" />
     <result column="pd_orderprice" property="pd_orderprice" jdbcType="DOUBLE" />
     <result column="pd_taxrate" property="pd_taxrate" jdbcType="DOUBLE" />

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/po/Account.java

@@ -25,7 +25,7 @@ public class Account implements Serializable {
      * 账号类型 0 - 管理员
      */
     private Integer type;
-    private boolean enabled;
+    private Boolean enabled;
     private Date createTime;
     private long creatorId;
     private Date updateTime;
@@ -96,11 +96,11 @@ public class Account implements Serializable {
         this.type = type;
     }
 
-    public boolean isEnabled() {
+    public Boolean isEnabled() {
         return enabled;
     }
 
-    public void setEnabled(boolean enabled) {
+    public void setEnabled(Boolean enabled) {
         this.enabled = enabled;
     }
 

frontend/saas-portal-web/src/pages/invitation_mobile_join/invitation_mobile_join.html

@@ -26,26 +26,30 @@
                   data: "param="+param,
                   async:false,
                   success: function(data){
-                        var data = data.data;
-                        if(data){
-                            $("#joinBtn").val(data.companyId);
-                            $("#sendman").text(data.username + ' 邀请您加入 ');
-                            $("#sendmsg").text(data.companyName);
-                            document.getElementsByClassName('x-join-center')[0].hidden = false;
-                            $.ajax({
-                                url:"https://saas-api.usoftchina.com/api/account/role/list/"+data.companyId,
-                                type: "GET",
-                                async:false,
-                                success: function(data){
-                                    var data = data.data;
-                                    $("#selectJob").prepend("<option value='0'>请选择岗位</option>");//添加第一个option值
-                            　　　　 for (var i = 0; i < data.length; i++) {
-                            　　　　    $("#selectJob").append("<option value='"+data[i].id+"'>"+data[i].name+"</option>");
-                                    }
-                                },
-                                error: function(err) {     
-                                } 
-                            });
+                        if(data.success){
+                            var data = data.data;
+                            if(data){
+                                $("#joinBtn").val(data.companyId);
+                                $("#sendman").text(data.username + ' 邀请您加入 ');
+                                $("#sendmsg").text(data.companyName);
+                                document.getElementsByClassName('x-join-center')[0].hidden = false;
+                                $.ajax({
+                                    url:"https://saas-api.usoftchina.com/api/account/role/list/"+data.companyId,
+                                    type: "GET",
+                                    async:false,
+                                    success: function(data){
+                                        var data = data.data;
+                                        $("#selectJob").prepend("<option value='0'>请选择岗位</option>");//添加第一个option值
+                                　　　　 for (var i = 0; i < data.length; i++) {
+                                　　　　    $("#selectJob").append("<option value='"+data[i].id+"'>"+data[i].name+"</option>");
+                                        }
+                                    },
+                                    error: function(err) {     
+                                    } 
+                                });
+                            }
+                        }else{
+                            document.getElementsByClassName('x-join-error')[0].hidden = false;
                         }
                   },
                   error: function(err) {     
@@ -180,10 +184,15 @@
             <input class="input_style" id="selectName" type="text" placeholder="请输入姓名"></input>
             <select class="input_style" id="selectJob" style="padding-top: 0px;" placeholder="请选择岗位"></select>
 			<button class="btn-submit" type="button" id="joinBtn" onclick="join();">提 交</button>
-        <div class="x-join-bottom">
+            <div class="x-join-bottom">
             <span style="font-size:16px;padding:0 0 0 5px;color: #999;">U企云服 | 电子行业企业管理云端方案</span>
             </br>
             <span style="font-size:16px;padding:0 0 0 5px;color: #999;">深圳市优软科技有限公司</span>
+            </div>
+        </div>
+        <div class="x-join-error" hidden>
+            </br></br></br></br>
+            <span id="error_code" style="padding:0 0 0 5px;color: #2f2c27;">访问链接已失效</span>
         </div>
     </body>
 </html>

frontend/saas-portal-web/static/css/invitation_mobile_join.css

@@ -18,6 +18,18 @@ body {
 	text-align: center;
 	background-color: #fff;
 }
+.x-join-error{
+    background: url("../img/error.png") no-repeat;
+    width: 281px;
+    height: 100px;
+    background-position: center;
+    position: absolute;
+    top: 55%;
+    left: 50%;
+    margin-top: -200px;
+    margin-left: -140px;
+	text-align: center;
+}
 .x-join-center {
 	width: 281px;
     height: 400px;

frontend/saas-web/app/view/core/chart/ChartBase.scss

@@ -20,7 +20,7 @@
                     width: 5px;
                     height: 16px;
                     border-radius: 4px;
-                    background: #2c82be;
+                    background: #33B4EE;
                     left: 4px;
                     top: 1px;
                 }

frontend/saas-web/app/view/home/charts/KeyData.scss

@@ -12,43 +12,48 @@
             width: calc(50% - 9px);
             background: #fff;
             cursor: pointer;
-            transition: all 0.4s ease;
+            transition: all 0.3s ease;
             outline: none !important;
 
+            // &:hover {
+            //     box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+            //     transform: translate3d(0, -2px, 0);
+            // }
+
             &:nth-child(1) {
                 margin: 0 8px 8px 0;
 
-                // &:hover {
-                //     margin: 2px 8px 14px 0;
-                //     box-shadow: 0 2px 2px 2px rgba(0, 0, 0, 0.12);
-                // }
+                &:hover {
+                    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+                    transform: translate3d(2px, 2px, 0);
+                }
             }
 
             &:nth-child(2) {
                 margin: 0 0 8px 8px;
 
-                // &:hover {
-                //     margin: 2px 0 14px 8px;
-                //     box-shadow: 0 2px 2px 2px rgba(0, 0, 0, 0.12);
-                // }
+                &:hover {
+                    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+                    transform: translate3d(-2px, 2px, 0);
+                }
             }
 
             &:nth-child(3) {
                 margin: 8px 8px 0 0;
 
-                // &:hover {
-                //     margin: 2px 8px 14px 0;
-                //     box-shadow: 0 2px 2px 2px rgba(0, 0, 0, 0.12);
-                // }
+                &:hover {
+                    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+                    transform: translate3d(2px, -2px, 0);
+                }
             }
 
             &:nth-child(4) {
                 margin: 8px 0 0 8px;
 
-                // &:hover {
-                //     margin: 2px 0 14px 8px;
-                //     box-shadow: 0 2px 2px 2px rgba(0, 0, 0, 0.12);
-                // }
+                &:hover {
+                    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+                    transform: translate3d(-2px, -2px, 0);
+                }
             }
 
             .x-box-content {
@@ -68,6 +73,7 @@
                 .x-contain {
                     border-style: solid;
                     border-width: 0 1px 1px 1px;
+                    border-radius: 0 0 4px 4px;
                     height: 100%;
 
                     .x-icon {

frontend/saas-web/app/view/main/MainController.js

@@ -278,7 +278,7 @@ Ext.define('saas.view.main.MainController', {
                                 var serverOptions = Ext.manifest.server;
                                 var delay = 1;//天
                                 var basePath = serverOptions.basePath.https?serverOptions.basePath.https:serverOptions.basePath;
-                                f.setSrc('/api/commons/share/qrcode?basePath='+basePath+'&delay='+delay)
+                                f.setSrc(basePath+'/api/commons/share/qrcode?basePath='+basePath+'&delay='+delay)
                             }
                         }
                     },{

frontend/saas-web/app/view/main/Navigation.scss

@@ -107,7 +107,7 @@ $menu-body-background-color: #65678C;
 
 .x-nav-menu {
     border: none;
-    border-radius: 0 4px 4px 0;
+    border-radius: 0 2px 2px 0;
 }
 
 .x-navitem-menu {
@@ -143,14 +143,6 @@ $menu-body-background-color: #65678C;
                 }
                 .menu-content {
                     border-left: 1px solid #A4ABBC;
-                    // &:before {
-                    //     content: '';
-                    //     position: absolute;
-                    //     width: 2px;
-                    //     height: 22px;
-                    //     margin-left: -2px;
-                    //     background: $menu-body-background-color;
-                    // }
                     &:after {
                         content: '';
                         position: absolute;
@@ -202,11 +194,11 @@ $menu-body-background-color: #65678C;
 
                     .item-icon {
                         cursor: pointer;
-                        background: #64b448;
+                        background: #33B4EE;
                         color: #fff;
                         display: none;
                         padding: 3px 6px;
-                        // border-radius: 3px;
+                        border-radius: 2px;
                         margin-right: 5px;
                         height: 24px;
                         margin-top: 5px;
@@ -217,17 +209,17 @@ $menu-body-background-color: #65678C;
                     }
 
                     &:hover {
-                        // border-radius: 4px;
+                        border-radius: 2px;
                         background-color: #595B7E;
 
-                        &:before {
-                            content: ' ';
-                            position: absolute;
-                            width: 6px;
-                            height: 34px;
-                            background: #34baf6;
-                            margin-left: -25px;
-                        }
+                        // &:before {
+                        //     content: ' ';
+                        //     position: absolute;
+                        //     width: 6px;
+                        //     height: 34px;
+                        //     background: #34baf6;
+                        //     margin-left: -25px;
+                        // }
 
                         .item-icon {
                             display: block;