更新依赖

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/ApprovalRecordController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.ApprovalRecord;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/CompanyController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.Company;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/CompanyMemberController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.CompanyMember;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceAgentController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.InsuranceAgent;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceDefinitionController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinition;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceDefinitionLimitController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceJobsController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.InsuranceJobs;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/JobsController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.Jobs;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/MessageController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.Message;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/TransactionRecordController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.TransactionRecord;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;

picc-admin-server/src/main/resources/logback-spring.xml

@@ -4,15 +4,15 @@
     <!--
     官方文档指明，需要使用<springProperty>,才可使用application.properties（或application.yml）中的值
     -->
-    <springProperty scope="context" userName="loggerLevel" source="logger.level"/>
-    <springProperty scope="context" userName="loggerPath" source="logger.dir"/>
-    <property userName="pattern" value="%date %level [%thread] %logger{36} [%file : %line] %msg%n"></property>
-    <appender userName="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <springProperty scope="context" name="loggerLevel" source="logger.level"/>
+    <springProperty scope="context" name="loggerPath" source="logger.dir"/>
+    <property name="pattern" value="%date %level [%thread] %logger{36} [%file : %line] %msg%n"></property>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>${pattern}</pattern>
         </encoder>
     </appender>
-    <appender userName="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${loggerPath}/logfile.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${loggerPath}/logfile.%d{yyyy-MM-dd}.log</fileNamePattern>
@@ -25,22 +25,22 @@
     <!--
     直接用maven的变量是@...@,用spring的变量是${...}
     -->
-    <springProfile userName="dev">
+    <springProfile name="dev">
         <!--root的level不能用变量-->
-        <logger userName="jdbc" additivity="false" level="WARN">
+        <logger name="jdbc" additivity="false" level="WARN">
             <appender-ref ref="STDOUT" />
         </logger>
-        <logger userName="jdbc.sqltiming" additivity="false" level="ON">
+        <logger name="jdbc.sqltiming" additivity="false" level="ON">
             <appender-ref ref="STDOUT" />
         </logger>
     </springProfile>
-    <springProfile userName="test">
+    <springProfile name="test">
         <root level="WARN">
             <appender-ref ref="STDOUT" />
             <appender-ref ref="FILE" />
         </root>
     </springProfile>
-    <springProfile userName="production">
+    <springProfile name="production">
         <root level="WARN">
             <appender-ref ref="STDOUT" />
             <appender-ref ref="FILE" />

picc-admin-server/src/test/java/com/jpsoft/picc/test/CompanyTest.java

@@ -1,5 +1,6 @@
 package com.jpsoft.picc.test;
 
+import com.jpsoft.picc.modules.base.entity.Company;
 import com.jpsoft.picc.modules.base.service.CompanyService;
 import org.junit.Test;
 import org.junit.runner.RunWith;

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/impl/JobsServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.picc.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.picc.modules.base.dao.JobsDAO;
+import com.jpsoft.picc.modules.base.entity.Jobs;
+import com.jpsoft.picc.modules.base.service.JobsService;
+import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="jobsService")
+public class JobsServiceImpl implements JobsService {
+	@Resource(name="jobsDAO")
+	private JobsDAO jobsDAO;
+
+	@Override
+	public Jobs get(String id) {
+		// TODO Auto-generated method stub
+		return jobsDAO.get(id);
+	}
+
+	@Override
+	public int insert(Jobs model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return jobsDAO.insert(model);
+	}
+
+	@Override
+	public int update(Jobs model) {
+		// TODO Auto-generated method stub
+		return jobsDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return jobsDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = jobsDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<Jobs> list() {
+		// TODO Auto-generated method stub
+		return jobsDAO.list();
+	}
+		
+	@Override
+	public Page<Jobs> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
+        Page<Jobs> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
+            jobsDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/controller/CompanyUserController.java

@@ -110,6 +110,8 @@ public class CompanyUserController {
 
                 companyUserService.update(companyUser);
 
+                //云平台账户同步
+
                 messageResult.setResult(true);
             }
             else{
@@ -228,6 +230,13 @@ public class CompanyUserController {
                 messageResult.setData(company.getId());
             }
 
+            CompanyUser companyUser = companyUserService.get(companyInfoDTO.getCompanyUserId());
+
+            if (companyUser!=null) {
+                companyUser.setCompanyId(companyInfoDTO.getId());
+                companyUserService.update(companyUser);
+            }
+
             messageResult.setResult(true);
         }
         catch (Exception ex){

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/dto/CompanyInfoDTO.java

@@ -7,6 +7,8 @@ import lombok.Data;
 @Data
 @ApiModel(value = "企业信息")
 public class CompanyInfoDTO {
+    @ApiModelProperty(value = "企业用户编号")
+    private String companyUserId;
     @ApiModelProperty(value = "企业编号")
     private String id;
     @ApiModelProperty(value = "企业名称")