CRM提交更新

ruoyi-oa/src/main/resources/mapper/oa/OaBusinessMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getBusinessProducts" resultType="com.ruoyi.oa.domain.vo.OaProductVo">
-        select op.product_id, op.product_name, op.product_number, op.unit, op.price, op.status, op.category_id, op.description, op.deleted
+        select op.product_id, op.product_name, op.product_number, op.unit, op.price, op.status, op.category_id, op.description, op.del_flag
         from oa_business ob
         left join oa_business_product obp on ob.business_id = obp.business_id
         left join oa_product op on obp.product_id = op.product_id

ruoyi-oa/src/main/resources/mapper/oa/OaClueMapper.xml

@@ -33,4 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
+    <select id="selectVoListPage" resultType="com.ruoyi.oa.domain.vo.OaClueVo">
+        select  oc.clue_id,oc.clue_id, oc.clue_name, oc.follow_up_status, oc.contact_last_time, oc.contact_last_content, oc.contact_next_time, oc.owner_user_id, oc.transform_status, oc.customer_id, oc.mobile, oc.telephone, oc.qq, oc.wechat, oc.email, oc.area_id, oc.detail_address, oc.industry_id, oc.level, oc.source, oc.remark, oc.create_by, oc.create_time, oc.update_by, oc.update_time, oc.del_flag
+        ,nick_name
+        from oa_clue oc
+        left join sys_user su on su.user_id = oc.owner_user_id
+            ${ew.getCustomSqlSegment}
+    </select>
+
+
 </mapper>

ruoyi-oa/src/main/resources/mapper/oa/OaCustomerMapper.xml

@@ -33,4 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
+    <select id="selectVoPageToUser" resultType="com.ruoyi.oa.domain.vo.OaCustomerVo">
+        select oc.customer_id, nick_name,name, follow_up_status, contact_last_time, contact_last_content, contact_next_time, owner_user_id, owner_time, deal_status, mobile, telephone, qq, wechat, oc.email, area_id, detail_address, industry_id, level, source, oc.remark,oc.create_by, oc.create_time, oc.update_by, oc.update_time, oc.del_flag from oa_customer oc
+        left join fad_oa.sys_user su on oc.owner_user_id = su.user_id
+            ${ew.getCustomSqlSegment}
+    </select>
+
+
 </mapper>

ruoyi-oa/src/main/resources/mapper/oa/OaProductMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
-        <result property="deleted" column="deleted"/>
+        <result property="delFlag" column="del_flag"/>
     </resultMap>
 
 

ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMapper.xml

@@ -34,8 +34,7 @@
             os.pay_time,
             os.base_salary,
             (
-            os.base_salary * DAY(LAST_DAY(#{payTime}))
-            + COALESCE(SUM(
+          COALESCE(SUM(
             CASE
             WHEN osi.flag = 1 THEN osi.price
             WHEN osi.flag = 0 THEN -osi.price
@@ -80,14 +79,13 @@
             os.pay_time,
             os.base_salary,
             (
-                os.base_salary * DAY(LAST_DAY(#{payTime}))
+              DAY(LAST_DAY(#{payTime}))
                     + COALESCE(SUM(
                                        CASE
                                            WHEN osi.flag = 1 THEN osi.price
                                            WHEN osi.flag = 0 THEN -osi.price
                                            ELSE 0
-                                           END
-                               ), 0)
+                                           END), 0)
                 ) AS real_salary,
             osi.salary_item_id,
             osi.reason,