Merge remote-tracking branch 'origin/dev' into test

src/main/java/com/ekexiu/portal/service/OrgService.java

	public void insert(@JdbcConn(true) Connection con,Organization organization) throws SQLException 
	{
		organization.setId(StringUtil.buildUUID());
		if(organization.getOrgType()== null) organization.setOrgType(this.defaultOrgType);
		//if(organization.getOrgType()== null) organization.setOrgType(this.defaultOrgType);
		if(organization.getIsJoin() == null ) organization.setIsJoin("0");
		this.orgDao.insert(con, organization);
		Organization no = this.orgDao.query(con, organization.getId());
		Organization org = new Organization();
		org.setId(id);
		org.setName(orgName);
		org.setOrgType(this.defaultOrgType);
//		org.setOrgType(this.defaultOrgType);
		org.setAuthStatus(this.defaultAuthStatus);
		org.setIsJoin("0");
		try {

src/main/resources/database.sql

UPDATE organization set is_join='0' WHERE is_join is null;
ALTER TABLE organization ALTER COLUMN is_join SET NOT NULL;
drop view view_user_count;
drop view view_user_pictable;
drop view view_allcustomer;
drop view view_customer;
drop view view_my_customer;
ALTER TABLE professor ALTER COLUMN phone TYPE varchar(50);
CREATE OR REPLACE VIEW view_allcustomer AS 
 SELECT professor.id,professor.email,professor.phone,luser.mobile_phone,luser.create_time,luser.active_time,
    luser.send_mail_status,luser.invite_code,luser.inviter_id,luser.user_type,professor.subject,professor.industry,
    professor.department,professor.office,professor.org_id,professor.title,professor.name,professor.address,
    professor.authentication,professor.auth_type,professor.auth_status,professor.sort_first,professor.auth_status_expert,
    organization.name AS orgname
   FROM ((luser RIGHT JOIN professor ON ((luser.id = professor.id)))
                LEFT JOIN organization ON ((professor.org_id = organization.id)));;
CREATE OR REPLACE VIEW view_customer AS 
 SELECT professor.id,professor.email,professor.phone,luser.mobile_phone,luser.create_time,luser.active_time,luser.send_mail_status,
    luser.invite_code,luser.inviter_id,luser.user_type,professor.subject,professor.industry,professor.department,professor.office,
    professor.org_id,professor.title,professor.name,professor.address,professor.authentication,professor.auth_type,professor.auth_status,
    professor.sort_first,professor.auth_status_expert,organization.name AS orgname
   FROM ((luser
     RIGHT JOIN professor ON ((luser.id = professor.id)))
     LEFT JOIN organization ON ((professor.org_id = organization.id)))
  WHERE (((luser.inviter_id IS NULL) OR (luser.active_time IS NULL)) AND (NOT (EXISTS ( SELECT customer_power.professor_id
           FROM customer_power
          WHERE ((customer_power.professor_id = luser.id) AND ((customer_power.pow_type = '0'::bpchar) OR (customer_power.pow_type = '1'::bpchar)))))));;
CREATE OR REPLACE VIEW view_my_customer AS 
 SELECT customer_power.power_id,professor.id,professor.email,professor.subject,professor.industry,professor.department,professor.office,professor.org_id,
 professor.title,professor.name,professor.address,professor.authentication,professor.auth_type,professor.auth_status,professor.sort_first,professor.auth_status_expert,
 organization.name AS orgname,customer_power.descp,customer_power.create_time,customer_power.pow_type,customer_power.modify_time,customer_power.cuser_id,
 luser.mobile_phone AS phone,cuser.name AS cuser_name,luser.invite_code
   FROM ((((customer_power
     JOIN professor ON ((customer_power.professor_id = professor.id)))
     JOIN organization ON ((professor.org_id = organization.id)))
     JOIN luser ON ((professor.id = luser.id)))
     JOIN cuser ON ((customer_power.cuser_id = cuser.id)));;
CREATE OR REPLACE VIEW view_user_count AS 
 SELECT to_date(cc.create_time, 'yyyymmdd'::text) AS create_time,
    COALESCE(znum.num, (0)::bigint) AS znum,
    COALESCE(jnum.jnum, (0)::bigint) AS jnum,
    dn.ljnum,
    dn.lznum
   FROM (((( SELECT to_char(generate_series((date_trunc('month'::text, now()) - '1 mon'::interval), now(), '1 day'::interval), 'yyyymmdd'::text) AS create_time) cc
     LEFT JOIN ( SELECT num.create_time,count(num.id) AS num
           FROM ( SELECT luser.id,
                    "substring"((luser.create_time)::text, 1, 8) AS create_time
                   FROM luser
                  WHERE (to_date((luser.create_time)::text, 'YYYYMMDDHH24MISS'::text) >= (now() - '30 days'::interval))) num
          GROUP BY num.create_time) znum ON ((cc.create_time = znum.create_time)))
     LEFT JOIN ( SELECT num1.create_time,
            count(num1.id) AS jnum
           FROM ( SELECT luser.id,
                    "substring"((luser.active_time)::text, 1, 8) AS create_time
                   FROM luser
                  WHERE (to_date((luser.active_time)::text, 'YYYYMMDDHH24MISS'::text) >= (now() - '30 days'::interval))) num1
          GROUP BY num1.create_time) jnum ON ((cc.create_time = jnum.create_time)))
     LEFT JOIN ( SELECT d1.create_time,
            0 AS num,
            0 AS jnum,
            d1.ljnum,
            d1.lznum
           FROM ( SELECT lj1.create_time,
                    sum(lj1.ljnum) AS ljnum,
                    sum(lj1.lznum) AS lznum
                   FROM ( SELECT to_char(now(), 'YYYYMMDD'::text) AS create_time,
                            0 AS ljnum,
                            count(luser.id) AS lznum
                           FROM luser
                          WHERE ("substring"((luser.create_time)::text, 1, 8) <= to_char(now(), 'YYYYMMDD'::text))
                        UNION
                         SELECT to_char(now(), 'YYYYMMDD'::text) AS create_time,
                            count(luser.id) AS ljnum,
                            0 AS lznum
                           FROM luser
                          WHERE ("substring"((luser.active_time)::text, 1, 8) <= to_char(now(), 'YYYYMMDD'::text))) lj1
                  GROUP BY lj1.create_time
                UNION
                 SELECT lj1.create_time,
                    sum(lj1.ljnum) AS ljnum,
                    sum(lj1.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '1 day'::interval), 'YYYYMMDD'::text) AS create_time,
                            0 AS ljnum,
                            count(luser.id) AS lznum
                           FROM luser
                          WHERE ("substring"((luser.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '1 day'::interval), 'YYYYMMDD'::text))
                        UNION
                         SELECT to_char((('now'::text)::date - '1 day'::interval), 'YYYYMMDD'::text) AS create_time,
                            count(luser.id) AS ljnum,
                            0 AS lznum
                           FROM luser
                          WHERE ("substring"((luser.active_time)::text, 1, 8) <= to_char((('now'::text)::date - '1 day'::interval), 'YYYYMMDD'::text))) lj1
                  GROUP BY lj1.create_time
                UNION
                 SELECT lj1.create_time,
                    sum(lj1.ljnum) AS ljnum,
                    sum(lj1.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '2 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            0 AS ljnum,
                            count(luser.id) AS lznum
                           FROM luser
                          WHERE ("substring"((luser.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '2 days'::interval), 'YYYYMMDD'::text))
                        UNION
                         SELECT to_char((('now'::text)::date - '2 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            count(luser.id) AS ljnum,
                            0 AS lznum
                           FROM luser
                          WHERE ("substring"((luser.active_time)::text, 1, 8) <= to_char((('now'::text)::date - '2 days'::interval), 'YYYYMMDD'::text))) lj1
                  GROUP BY lj1.create_time
                UNION
                 SELECT lj1.create_time,
                    sum(lj1.ljnum) AS ljnum,
                    sum(lj1.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '3 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            0 AS ljnum,
                            count(luser.id) AS lznum
                           FROM luser
                          WHERE ("substring"((luser.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '3 days'::interval), 'YYYYMMDD'::text))
                        UNION
                         SELECT to_char((('now'::text)::date - '3 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            count(luser.id) AS ljnum,
                            0 AS lznum
                           FROM luser
                          WHERE ("substring"((luser.active_time)::text, 1, 8) <= to_char((('now'::text)::date - '3 days'::interval), 'YYYYMMDD'::text))) lj1
                  GROUP BY lj1.create_time
                UNION
                 SELECT lj1.create_time,
                    sum(lj1.ljnum) AS ljnum,
                    sum(lj1.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '4 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            0 AS ljnum,
                            count(luser.id) AS lznum
                           FROM luser
                          WHERE ("substring"((luser.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '4 days'::interval), 'YYYYMMDD'::text))
                        UNION
                         SELECT to_char((('now'::text)::date - '4 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            count(luser.id) AS ljnum,
                            0 AS lznum
                           FROM luser
                          WHERE ("substring"((luser.active_time)::text, 1, 8) <= to_char((('now'::text)::date - '4 days'::interval), 'YYYYMMDD'::text))) lj1
                  GROUP BY lj1.create_time
                UNION
                 SELECT lj1.create_time,
                    sum(lj1.ljnum) AS ljnum,
                    sum(lj1.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '5 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            0 AS ljnum,
                            count(luser.id) AS lznum
                           FROM luser
                          WHERE ("substring"((luser.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '5 days'::interval), 'YYYYMMDD'::text))
                        UNION
                         SELECT to_char((('now'::text)::date - '5 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            count(luser.id) AS ljnum,
                            0 AS lznum
                           FROM luser
                          WHERE ("substring"((luser.active_time)::text, 1, 8) <= to_char((('now'::text)::date - '5 days'::interval), 'YYYYMMDD'::text))) lj1
                  GROUP BY lj1.create_time
                UNION
                 SELECT lj1.create_time,
                    sum(lj1.ljnum) AS ljnum,
                    sum(lj1.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '6 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            0 AS ljnum,
                            count(luser.id) AS lznum
                           FROM luser
                          WHERE ("substring"((luser.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '6 days'::interval), 'YYYYMMDD'::text))
                        UNION
                         SELECT to_char((('now'::text)::date - '6 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            count(luser.id) AS ljnum,
                            0 AS lznum
                           FROM luser
                          WHERE ("substring"((luser.active_time)::text, 1, 8) <= to_char((('now'::text)::date - '6 days'::interval), 'YYYYMMDD'::text))) lj1
                  GROUP BY lj1.create_time) d1) dn ON ((cc.create_time = dn.create_time)));;
CREATE OR REPLACE VIEW  view_user_pictable AS 
 SELECT dn.create_time,
    dn.cuser_id,
    sum(dn.znum) AS znum, sum(dn.jnum) AS jnum,
    sum(dn.ljnum) AS ljnum,
    sum(dn.lznum) AS lznum
   FROM ( SELECT to_date(u.create_time, 'YYYYMMDD'::text) AS create_time,
            u.cuser_id,
            0 AS znum,
            0 AS jnum,
            0 AS ljnum,
            0 AS lznum
           FROM ( SELECT to_char(now(), 'YYYYMMDD'::text) AS create_time,
                    cuser.id AS cuser_id
                   FROM cuser
                UNION
                 SELECT to_char((('now'::text)::date - '1 day'::interval), 'YYYYMMDD'::text) AS create_time,
                    cuser.id AS cuser_id
                   FROM cuser
                UNION
                 SELECT to_char((('now'::text)::date - '2 days'::interval), 'YYYYMMDD'::text) AS create_time,
                    cuser.id AS cuser_id
                   FROM cuser
                UNION
                 SELECT to_char((('now'::text)::date - '3 days'::interval), 'YYYYMMDD'::text) AS create_time,
                    cuser.id AS cuser_id
                   FROM cuser
                UNION
                 SELECT to_char((('now'::text)::date - '4 days'::interval), 'YYYYMMDD'::text) AS create_time,
                    cuser.id AS cuser_id
                   FROM cuser
                UNION
                 SELECT to_char((('now'::text)::date - '5 days'::interval), 'YYYYMMDD'::text) AS create_time,
                    cuser.id AS cuser_id
                   FROM cuser
                UNION
                 SELECT to_char((('now'::text)::date - '6 days'::interval), 'YYYYMMDD'::text) AS create_time,
                    cuser.id AS cuser_id
                   FROM cuser) u
        UNION
         SELECT to_date(n1.create_time, 'YYYYMMDD'::text) AS create_time,
            n1.cuser_id,
            n1.znum,
            0 AS jnum,
            (0)::numeric AS ljnum,
            (0)::numeric AS lznum
           FROM ( SELECT "substring"((view_my_customer.create_time)::text, 1, 8) AS create_time,
                    view_my_customer.cuser_id,
                    count(view_my_customer.power_id) AS znum
                   FROM view_my_customer
                  WHERE (to_date((view_my_customer.create_time)::text, 'YYYYMMDDHH24MISS'::text) >= (('now'::text)::date - '6 days'::interval))
                  GROUP BY "substring"((view_my_customer.create_time)::text, 1, 8), view_my_customer.cuser_id) n1
        UNION
         SELECT to_date(j1.create_time, 'YYYYMMDD'::text) AS create_time,
            j1.cuser_id,
            0 AS znum,
            j1.jnum,
            (0)::numeric AS ljnum,
            (0)::numeric AS lznum
           FROM ( SELECT "substring"((view_my_customer.create_time)::text, 1, 8) AS create_time,
                    view_my_customer.cuser_id,
                    count(view_my_customer.power_id) AS jnum
                   FROM view_my_customer
                  WHERE ((to_date((view_my_customer.create_time)::text, 'YYYYMMDDHH24MISS'::text) >= (('now'::text)::date - '6 days'::interval)) AND (view_my_customer.pow_type = '1'::bpchar))
                  GROUP BY "substring"((view_my_customer.create_time)::text, 1, 8), view_my_customer.cuser_id) j1
        UNION
         SELECT to_date(d1.create_time, 'YYYYMMDD'::text) AS create_time,
            d1.cuser_id,
            0 AS znum,
            0 AS jnum,
            d1.ljnum,
            d1.lznum
           FROM ( SELECT lj1.create_time,
                    lj1.cuser_id,
                    sum(lj1.ljnum) AS ljnum,
                    sum(lj1.lznum) AS lznum
                   FROM ( SELECT to_char(now(), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            0 AS ljnum,
                            count(view_my_customer.power_id) AS lznum
                           FROM view_my_customer
                          WHERE ("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char(now(), 'YYYYMMDD'::text))
                          GROUP BY view_my_customer.cuser_id
                        UNION
                         SELECT to_char(now(), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            count(view_my_customer.power_id) AS ljnum,
                            0 AS lznum
                           FROM view_my_customer
                          WHERE (("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char(now(), 'YYYYMMDD'::text)) AND (view_my_customer.pow_type = '1'::bpchar))
                          GROUP BY view_my_customer.cuser_id) lj1
                  GROUP BY lj1.create_time, lj1.cuser_id
                UNION
                 SELECT lj2.create_time,
                    lj2.cuser_id,
                    sum(lj2.ljnum) AS ljnum,
                    sum(lj2.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '1 day'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            0 AS ljnum,
                            count(view_my_customer.power_id) AS lznum
                           FROM view_my_customer
                          WHERE ("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '1 day'::interval), 'YYYYMMDD'::text))
                          GROUP BY view_my_customer.cuser_id
                        UNION
                         SELECT to_char((('now'::text)::date - '1 day'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            count(view_my_customer.power_id) AS ljnum,
                            0 AS lznum
                           FROM view_my_customer
                          WHERE (("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '1 day'::interval), 'YYYYMMDD'::text)) AND (view_my_customer.pow_type = '1'::bpchar))
                          GROUP BY view_my_customer.cuser_id) lj2
                  GROUP BY lj2.create_time, lj2.cuser_id
                UNION
                 SELECT lj3.create_time,
                    lj3.cuser_id,
                    sum(lj3.ljnum) AS ljnum,
                    sum(lj3.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '2 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            0 AS ljnum,
                            count(view_my_customer.power_id) AS lznum
                           FROM view_my_customer
                          WHERE ("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '2 days'::interval), 'YYYYMMDD'::text))
                          GROUP BY view_my_customer.cuser_id
                        UNION
                         SELECT to_char((('now'::text)::date - '2 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            count(view_my_customer.power_id) AS ljnum,
                            0 AS lznum
                           FROM view_my_customer
                          WHERE (("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '2 days'::interval), 'YYYYMMDD'::text)) AND (view_my_customer.pow_type = '1'::bpchar))
                          GROUP BY view_my_customer.cuser_id) lj3
                  GROUP BY lj3.create_time, lj3.cuser_id
                UNION
                 SELECT lj4.create_time,
                    lj4.cuser_id,
                    sum(lj4.ljnum) AS ljnum,
                    sum(lj4.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '3 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            0 AS ljnum,
                            count(view_my_customer.power_id) AS lznum
                           FROM view_my_customer
                          WHERE ("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '3 days'::interval), 'YYYYMMDD'::text))
                          GROUP BY view_my_customer.cuser_id
                        UNION
                         SELECT to_char((('now'::text)::date - '3 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            count(view_my_customer.power_id) AS ljnum,
                            0 AS lznum
                           FROM view_my_customer
                          WHERE (("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '3 days'::interval), 'YYYYMMDD'::text)) AND (view_my_customer.pow_type = '1'::bpchar))
                          GROUP BY view_my_customer.cuser_id) lj4
                  GROUP BY lj4.create_time, lj4.cuser_id
                UNION
                 SELECT lj5.create_time,
                    lj5.cuser_id,
                    sum(lj5.ljnum) AS ljnum,
                    sum(lj5.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '4 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            0 AS ljnum,
                            count(view_my_customer.power_id) AS lznum
                           FROM view_my_customer
                          WHERE ("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '4 days'::interval), 'YYYYMMDD'::text))
                          GROUP BY view_my_customer.cuser_id
                        UNION
                         SELECT to_char((('now'::text)::date - '4 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            count(view_my_customer.power_id) AS ljnum,
                            0 AS lznum
                           FROM view_my_customer
                          WHERE (("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '4 days'::interval), 'YYYYMMDD'::text)) AND (view_my_customer.pow_type = '1'::bpchar))
                          GROUP BY view_my_customer.cuser_id) lj5
                  GROUP BY lj5.create_time, lj5.cuser_id
                UNION
                 SELECT lj6.create_time,
                    lj6.cuser_id,
                    sum(lj6.ljnum) AS ljnum,
                    sum(lj6.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '5 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            0 AS ljnum,
                            count(view_my_customer.power_id) AS lznum
                           FROM view_my_customer
                          WHERE ("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '5 days'::interval), 'YYYYMMDD'::text))
                          GROUP BY view_my_customer.cuser_id
                        UNION
                         SELECT to_char((('now'::text)::date - '5 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            count(view_my_customer.power_id) AS ljnum,
                            0 AS lznum
                           FROM view_my_customer
                          WHERE (("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '5 days'::interval), 'YYYYMMDD'::text)) AND (view_my_customer.pow_type = '1'::bpchar))
                          GROUP BY view_my_customer.cuser_id) lj6
                  GROUP BY lj6.create_time, lj6.cuser_id
                UNION
                 SELECT lj7.create_time,
                    lj7.cuser_id,
                    sum(lj7.ljnum) AS ljnum,
                    sum(lj7.lznum) AS lznum
                   FROM ( SELECT to_char((('now'::text)::date - '6 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            0 AS ljnum,
                            count(view_my_customer.power_id) AS lznum
                           FROM view_my_customer
                          WHERE ("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '6 days'::interval), 'YYYYMMDD'::text))
                          GROUP BY view_my_customer.cuser_id
                        UNION
                         SELECT to_char((('now'::text)::date - '6 days'::interval), 'YYYYMMDD'::text) AS create_time,
                            view_my_customer.cuser_id,
                            count(view_my_customer.power_id) AS ljnum,
                            0 AS lznum
                           FROM view_my_customer
                          WHERE (("substring"((view_my_customer.create_time)::text, 1, 8) <= to_char((('now'::text)::date - '6 days'::interval), 'YYYYMMDD'::text)) AND (view_my_customer.pow_type = '1'::bpchar))
                          GROUP BY view_my_customer.cuser_id) lj7
                  GROUP BY lj7.create_time, lj7.cuser_id) d1) dn
  GROUP BY dn.create_time, dn.cuser_id
  ORDER BY dn.create_time;;